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\".
39 When you have resolved this problem run \"git rebase --continue\".
40 To restore the original branch and stop rebasing run \"git rebase --abort\".
45 dotest=$GIT_DIR/.dotest-merge
49 test -n "$prev_head" || die "prev_head must be defined"
50 test -d "$dotest" || die "$dotest directory does not exist"
52 unmerged=$(git-ls-files -u)
53 if test -n "$unmerged"
55 echo "You still have unmerged paths in your index"
56 echo "did you forget update-index?"
60 if test -n "`git-diff-index HEAD`"
62 git-commit -C "`cat $dotest/current`"
64 echo "Previous merge succeeded automatically"
67 prev_head=`git-rev-parse HEAD^0`
69 # save the resulting commit so we can read-tree on it later
70 echo "$prev_head" > "$dotest/cmt.$msgnum.result"
71 echo "$prev_head" > "$dotest/prev_head"
73 # onto the next patch:
74 msgnum=$(($msgnum + 1))
75 echo "$msgnum" >"$dotest/msgnum"
79 cmt="$(cat $dotest/cmt.$1)"
80 echo "$cmt" > "$dotest/current"
81 git-merge-$strategy "$cmt^" -- HEAD "$cmt"
85 git-commit -C "$cmt" || die "commit failed: $MRESOLVEMSG"
88 test -d "$GIT_DIR/rr-cache" && git-rerere
92 echo "Strategy: $rv $strategy failed, try another" 1>&2
96 die "Unknown exit code ($rv) from command:" \
97 "git-merge-$strategy $cmt^ -- HEAD $cmt"
106 echo "Finalizing rebased commits..."
107 git-reset --hard "`cat $dotest/onto`"
108 end="`cat $dotest/end`"
109 while test "$msgnum" -le "$end"
111 git-read-tree `cat "$dotest/cmt.$msgnum.result"`
112 git-checkout-index -q -f -u -a
113 git-commit -C "`cat $dotest/cmt.$msgnum`"
115 printf "Committed %0${prec}d" $msgnum
116 echo ' '`git-rev-list --pretty=oneline -1 HEAD | \
117 sed 's/^[a-f0-9]\+ //'`
118 msgnum=$(($msgnum + 1))
124 while case "$#" in 0) break ;; esac
128 diff=$(git-diff-files)
130 ?*) echo "You must edit all merge conflicts and then"
131 echo "mark them as resolved using git update-index"
137 prev_head="`cat $dotest/prev_head`"
138 end="`cat $dotest/end`"
139 msgnum="`cat $dotest/msgnum`"
140 onto="`cat $dotest/onto`"
142 while test "$msgnum" -le "$end"
150 git am --resolved --3way --resolvemsg="$RESOLVEMSG"
156 die "--skip is not supported when using --merge"
158 git am -3 --skip --resolvemsg="$RESOLVEMSG"
169 die "No rebase in progress?"
171 git reset --hard ORIG_HEAD
175 test 2 -le "$#" || usage
179 -M|-m|--m|--me|--mer|--merg|--merge)
182 -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
183 --strateg=*|--strategy=*|\
184 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
187 strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
206 # Make sure we do not have .dotest
207 if test -z "$do_merge"
214 It seems that I cannot create a .dotest directory, and I wonder if you
215 are in the middle of patch application or another rebase. If that is not
216 the case, please rm -fr .dotest and run me again. I am stopping in case
217 you still have something valuable there.'
223 die "previous dotest directory $dotest still exists." \
224 'try git-rebase < --continue | --abort >'
228 # The tree must be really really clean.
229 git-update-index --refresh || exit
230 diff=$(git-diff-index --cached --name-status -r HEAD)
237 # The upstream head must be given. Make sure it is valid.
239 upstream=`git rev-parse --verify "${upstream_name}^0"` ||
240 die "invalid upstream $upstream_name"
242 # If a hook exists, give it a chance to interrupt
243 if test -x "$GIT_DIR/hooks/pre-rebase"
245 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || {
246 echo >&2 "The pre-rebase hook refused to rebase."
251 # If the branch to rebase is given, first switch to it.
255 git-checkout "$2" || usage
258 branch_name=`git symbolic-ref HEAD` || die "No current branch"
259 branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
262 branch=$(git-rev-parse --verify "${branch_name}^0") || exit
264 # Make sure the branch to rebase onto is valid.
265 onto_name=${newbase-"$upstream_name"}
266 onto=$(git-rev-parse --verify "${onto_name}^0") || exit
268 # Now we are rebasing commits $upstream..$branch on top of $onto
270 # Check if we are already based on $onto, but this should be
271 # done only when upstream and onto are the same.
272 if test "$upstream" = "$onto"
274 mb=$(git-merge-base "$onto" "$branch")
275 if test "$mb" = "$onto"
277 echo >&2 "Current branch $branch_name is up to date."
282 # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.
283 git-reset --hard "$onto"
285 # If the $onto is a proper descendant of the tip of the branch, then
286 # we just fast forwarded.
287 if test "$mb" = "$onto"
289 echo >&2 "Fast-forwarded $branch to $newbase."
293 if test -z "$do_merge"
295 git-format-patch -k --stdout --full-index "$upstream"..ORIG_HEAD |
296 git am --binary -3 -k --resolvemsg="$RESOLVEMSG"
300 if test "@@NO_PYTHON@@" && test "$strategy" = "recursive"
302 die 'The recursive merge strategy currently relies on Python,
303 which this installation of git was not configured with. Please consider
304 a different merge strategy (e.g. octopus, resolve, stupid, ours)
305 or install Python and git with Python support.'
309 # start doing a rebase with git-merge
310 # this is rename-aware if the recursive (default) strategy is used
313 echo "$onto" > "$dotest/onto"
314 prev_head=`git-rev-parse HEAD^0`
315 echo "$prev_head" > "$dotest/prev_head"
318 for cmt in `git-rev-list --no-merges "$upstream"..ORIG_HEAD \
319 | perl -e 'print reverse <>'`
321 msgnum=$(($msgnum + 1))
322 echo "$cmt" > "$dotest/cmt.$msgnum"
325 echo 1 >"$dotest/msgnum"
326 echo $msgnum >"$dotest/end"
331 while test "$msgnum" -le "$end"