Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
44b91aca
Commit
44b91aca
authored
Jul 02, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
We should just pass the merge-base after all
parent
6220bdbb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
scripts/ee_specific_check/ee_specific_check.rb
scripts/ee_specific_check/ee_specific_check.rb
+1
-1
No files found.
scripts/ee_specific_check/ee_specific_check.rb
View file @
44b91aca
...
...
@@ -152,7 +152,7 @@ module EESpecificCheck
# CE and EE branches.
def
checkout_and_rebase
(
new_base
,
old_base
,
target_head
)
with_detached_head
(
target_head
)
do
run_git_command
(
"rebase --onto
#{
new_base
}
#{
old_base
}
~1
#{
target_head
}
"
)
run_git_command
(
"rebase --onto
#{
new_base
}
#{
old_base
}
#{
target_head
}
"
)
status
=
git_status
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment