3 # Copyright (c) 2005 Junio C Hamano.
6 USAGE
='[--onto <newbase>] <upstream> [<branch>]'
7 LONG_USAGE
='git-rebase replaces <branch> with a new branch of the
8 same name. When the --onto option is provided the new branch starts
9 out with a HEAD equal to <newbase>, otherwise it is equal to <upstream>
10 It then attempts to create a new commit for each commit from the original
11 <branch> that does not exist in the <upstream> branch.
13 It is possible that a merge failure will prevent this process from being
14 completely automatic. You will have to resolve any such merge failure
15 and run git rebase --continue. Another option is to bypass the commit
16 that caused the merge failure with git rebase --skip. To restore the
17 original <branch> and remove the .dotest working files, use the command
18 git rebase --abort instead.
20 Note that if <branch> is not specified on the command line, the
21 currently checked out branch is used. You must be in the top
22 directory of your project to start (or continue) a rebase.
24 Example: git-rebase master~1 topic
26 A---B---C topic A'\''--B'\''--C'\'' topic
28 D---E---F---G master D---E---F---G master
33 When you have resolved this problem run \"git rebase --continue\".
34 If you would prefer to skip this patch, instead run \"git rebase --skip\".
35 To restore the original branch and stop rebasing run \"git rebase --abort\".
40 dotest
=$GIT_DIR/.dotest-merge
44 test -n "$prev_head" || die
"prev_head must be defined"
45 test -d "$dotest" || die
"$dotest directory does not exist"
47 unmerged
=$
(git-ls-files
-u)
48 if test -n "$unmerged"
50 echo "You still have unmerged paths in your index"
51 echo "did you forget update-index?"
55 if test -n "`git-diff-index HEAD`"
57 printf "Committed: %0${prec}d" $msgnum
58 git-commit
-C "`cat $dotest/current`"
60 printf "Already applied: %0${prec}d" $msgnum
62 echo ' '`git-rev-list --pretty=oneline -1 HEAD | \
63 sed 's/^[a-f0-9]\+ //'`
65 prev_head
=`git-rev-parse HEAD^0`
66 # save the resulting commit so we can read-tree on it later
67 echo "$prev_head" > "$dotest/prev_head"
69 # onto the next patch:
70 msgnum
=$
(($msgnum + 1))
71 echo "$msgnum" >"$dotest/msgnum"
75 cmt
="$(cat $dotest/cmt.$1)"
76 echo "$cmt" > "$dotest/current"
77 git-merge-
$strategy "$cmt^" -- HEAD
"$cmt"
84 test -d "$GIT_DIR/rr-cache" && git-rerere
88 echo "Strategy: $rv $strategy failed, try another" 1>&2
92 die
"Unknown exit code ($rv) from command:" \
93 "git-merge-$strategy $cmt^ -- HEAD $cmt"
103 while case "$#" in 0) break ;; esac
107 diff=$
(git-diff-files
)
109 ?
*) echo "You must edit all merge conflicts and then"
110 echo "mark them as resolved using git update-index"
116 prev_head
="`cat $dotest/prev_head`"
117 end
="`cat $dotest/end`"
118 msgnum
="`cat $dotest/msgnum`"
119 onto
="`cat $dotest/onto`"
121 while test "$msgnum" -le "$end"
129 git am
--resolved --3way --resolvemsg="$RESOLVEMSG"
135 prev_head
="`cat $dotest/prev_head`"
136 end
="`cat $dotest/end`"
137 msgnum
="`cat $dotest/msgnum`"
138 msgnum
=$
(($msgnum + 1))
139 onto
="`cat $dotest/onto`"
140 while test "$msgnum" -le "$end"
148 git am
-3 --skip --resolvemsg="$RESOLVEMSG"
159 die
"No rebase in progress?"
161 git
reset --hard ORIG_HEAD
165 test 2 -le "$#" || usage
169 -M|
-m|
--m|
--me|
--mer|
--merg|
--merge)
172 -s=*|
--s=*|
--st=*|
--str=*|
--stra=*|
--strat=*|
--strate=*|\
173 --strateg=*|
--strategy=*|\
174 -s|
--s|
--st|
--str|
--stra|
--strat|
--strate|
--strateg|
--strategy)
177 strategy
=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
196 # Make sure we do not have .dotest
197 if test -z "$do_merge"
204 It seems that I cannot create a .dotest directory, and I wonder if you
205 are in the middle of patch application or another rebase. If that is not
206 the case, please rm -fr .dotest and run me again. I am stopping in case
207 you still have something valuable there.'
213 die
"previous dotest directory $dotest still exists." \
214 'try git-rebase < --continue | --abort >'
218 # The tree must be really really clean.
219 git-update-index
--refresh ||
exit
220 diff=$
(git-diff-index
--cached --name-status -r HEAD
)
227 # The upstream head must be given. Make sure it is valid.
229 upstream
=`git rev-parse --verify "${upstream_name}^0"` ||
230 die
"invalid upstream $upstream_name"
232 # If a hook exists, give it a chance to interrupt
233 if test -x "$GIT_DIR/hooks/pre-rebase"
235 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} ||
{
236 echo >&2 "The pre-rebase hook refused to rebase."
241 # If the branch to rebase is given, first switch to it.
245 git-checkout
"$2" || usage
248 branch_name
=`git symbolic-ref HEAD` || die
"No current branch"
249 branch_name
=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
252 branch
=$
(git-rev-parse
--verify "${branch_name}^0") ||
exit
254 # Make sure the branch to rebase onto is valid.
255 onto_name
=${newbase-"$upstream_name"}
256 onto
=$
(git-rev-parse
--verify "${onto_name}^0") ||
exit
258 # Now we are rebasing commits $upstream..$branch on top of $onto
260 # Check if we are already based on $onto, but this should be
261 # done only when upstream and onto are the same.
262 if test "$upstream" = "$onto"
264 mb
=$
(git-merge-base
"$onto" "$branch")
265 if test "$mb" = "$onto"
267 echo >&2 "Current branch $branch_name is up to date."
272 # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.
273 git-reset
--hard "$onto"
275 # If the $onto is a proper descendant of the tip of the branch, then
276 # we just fast forwarded.
277 if test "$mb" = "$onto"
279 echo >&2 "Fast-forwarded $branch to $newbase."
283 if test -z "$do_merge"
285 git-format-patch
-k --stdout --full-index "$upstream"..ORIG_HEAD |
286 git am
--binary -3 -k --resolvemsg="$RESOLVEMSG"
290 if test "@@NO_PYTHON@@" && test "$strategy" = "recursive"
292 die
'The recursive merge strategy currently relies on Python,
293 which this installation of git was not configured with. Please consider
294 a different merge strategy (e.g. octopus, resolve, stupid, ours)
295 or install Python and git with Python support.'
299 # start doing a rebase with git-merge
300 # this is rename-aware if the recursive (default) strategy is used
303 echo "$onto" > "$dotest/onto"
304 prev_head
=`git-rev-parse HEAD^0`
305 echo "$prev_head" > "$dotest/prev_head"
308 for cmt
in `git-rev-list --no-merges "$upstream"..ORIG_HEAD \
309 | perl -e 'print reverse <>'`
311 msgnum
=$
(($msgnum + 1))
312 echo "$cmt" > "$dotest/cmt.$msgnum"
315 echo 1 >"$dotest/msgnum"
316 echo $msgnum >"$dotest/end"
321 while test "$msgnum" -le "$end"