3 # Copyright (c) 2005 Junio C Hamano.
6 USAGE
='[-v] [--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
31 set_reflog_action rebase
34 When you have resolved this problem run \"git rebase --continue\".
35 If you would prefer to skip this patch, instead run \"git rebase --skip\".
36 To restore the original branch and stop rebasing run \"git rebase --abort\".
41 dotest
=$GIT_DIR/.dotest-merge
46 test -n "$prev_head" || die
"prev_head must be defined"
47 test -d "$dotest" || die
"$dotest directory does not exist"
49 unmerged
=$
(git-ls-files
-u)
50 if test -n "$unmerged"
52 echo "You still have unmerged paths in your index"
53 echo "did you forget update-index?"
57 if test -n "`git-diff-index HEAD`"
59 if ! git-commit
-C "`cat $dotest/current`"
61 echo "Commit failed, please do not call \"git commit\""
62 echo "directly, but instead do one of the following: "
65 printf "Committed: %0${prec}d" $msgnum
67 printf "Already applied: %0${prec}d" $msgnum
69 echo ' '`git-rev-list --pretty=oneline -1 HEAD | \
70 sed 's/^[a-f0-9]\+ //'`
72 prev_head
=`git-rev-parse HEAD^0`
73 # save the resulting commit so we can read-tree on it later
74 echo "$prev_head" > "$dotest/prev_head"
76 # onto the next patch:
77 msgnum
=$
(($msgnum + 1))
78 echo "$msgnum" >"$dotest/msgnum"
82 cmt
="$(cat $dotest/cmt.$1)"
83 echo "$cmt" > "$dotest/current"
84 git-merge-
$strategy "$cmt^" -- HEAD
"$cmt"
91 test -d "$GIT_DIR/rr-cache" && git-rerere
95 echo "Strategy: $rv $strategy failed, try another" 1>&2
99 die
"Unknown exit code ($rv) from command:" \
100 "git-merge-$strategy $cmt^ -- HEAD $cmt"
110 while case "$#" in 0) break ;; esac
114 diff=$
(git-diff-files
)
116 ?
*) echo "You must edit all merge conflicts and then"
117 echo "mark them as resolved using git update-index"
123 prev_head
="`cat $dotest/prev_head`"
124 end
="`cat $dotest/end`"
125 msgnum
="`cat $dotest/msgnum`"
126 onto
="`cat $dotest/onto`"
128 while test "$msgnum" -le "$end"
136 git am
--resolved --3way --resolvemsg="$RESOLVEMSG"
142 if test -d "$GIT_DIR/rr-cache"
146 prev_head
="`cat $dotest/prev_head`"
147 end
="`cat $dotest/end`"
148 msgnum
="`cat $dotest/msgnum`"
149 msgnum
=$
(($msgnum + 1))
150 onto
="`cat $dotest/onto`"
151 while test "$msgnum" -le "$end"
159 git am
-3 --skip --resolvemsg="$RESOLVEMSG"
163 if test -d "$GIT_DIR/rr-cache"
174 die
"No rebase in progress?"
176 git
reset --hard ORIG_HEAD
180 test 2 -le "$#" || usage
184 -M|
-m|
--m|
--me|
--mer|
--merg|
--merge)
187 -s=*|
--s=*|
--st=*|
--str=*|
--stra=*|
--strat=*|
--strate=*|\
188 --strateg=*|
--strategy=*|\
189 -s|
--s|
--st|
--str|
--stra|
--strat|
--strate|
--strateg|
--strategy)
192 strategy
=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
214 # Make sure we do not have .dotest
215 if test -z "$do_merge"
222 It seems that I cannot create a .dotest directory, and I wonder if you
223 are in the middle of patch application or another rebase. If that is not
224 the case, please rm -fr .dotest and run me again. I am stopping in case
225 you still have something valuable there.'
231 die
"previous dotest directory $dotest still exists." \
232 'try git-rebase < --continue | --abort >'
236 # The tree must be really really clean.
237 git-update-index
--refresh ||
exit
238 diff=$
(git-diff-index
--cached --name-status -r HEAD
)
245 # The upstream head must be given. Make sure it is valid.
247 upstream
=`git rev-parse --verify "${upstream_name}^0"` ||
248 die
"invalid upstream $upstream_name"
250 # If a hook exists, give it a chance to interrupt
251 if test -x "$GIT_DIR/hooks/pre-rebase"
253 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} ||
{
254 echo >&2 "The pre-rebase hook refused to rebase."
259 # If the branch to rebase is given, first switch to it.
263 git-checkout
"$2" || usage
266 branch_name
=`git symbolic-ref HEAD` || die
"No current branch"
267 branch_name
=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
270 branch
=$
(git-rev-parse
--verify "${branch_name}^0") ||
exit
272 # Make sure the branch to rebase onto is valid.
273 onto_name
=${newbase-"$upstream_name"}
274 onto
=$
(git-rev-parse
--verify "${onto_name}^0") ||
exit
276 # Now we are rebasing commits $upstream..$branch on top of $onto
278 # Check if we are already based on $onto, but this should be
279 # done only when upstream and onto are the same.
280 mb
=$
(git-merge-base
"$onto" "$branch")
281 if test "$upstream" = "$onto" && test "$mb" = "$onto"
283 echo >&2 "Current branch $branch_name is up to date."
287 if test -n "$verbose"
289 echo "Changes from $mb to $onto:"
290 git-diff-tree
--stat --summary "$mb" "$onto"
293 # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.
294 echo "First, rewinding head to replay your work on top of it..."
295 git-reset
--hard "$onto"
297 # If the $onto is a proper descendant of the tip of the branch, then
298 # we just fast forwarded.
299 if test "$mb" = "$branch"
301 echo >&2 "Fast-forwarded $branch_name to $onto_name."
305 if test -z "$do_merge"
307 git-format-patch
-k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
308 git am
--binary -3 -k --resolvemsg="$RESOLVEMSG"
312 # start doing a rebase with git-merge
313 # this is rename-aware if the recursive (default) strategy is used
316 echo "$onto" > "$dotest/onto"
317 prev_head
=`git-rev-parse HEAD^0`
318 echo "$prev_head" > "$dotest/prev_head"
321 for cmt
in `git-rev-list --no-merges "$upstream"..ORIG_HEAD \
322 | @@PERL@@ -e 'print reverse <>'`
324 msgnum
=$
(($msgnum + 1))
325 echo "$cmt" > "$dotest/cmt.$msgnum"
328 echo 1 >"$dotest/msgnum"
329 echo $msgnum >"$dotest/end"
334 while test "$msgnum" -le "$end"