3 # Copyright (c) 2005 Junio C Hamano.
6 USAGE
='[--interactive | -i] [-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
33 set_reflog_action rebase
38 When you have resolved this problem run \"git rebase --continue\".
39 If you would prefer to skip this patch, instead run \"git rebase --skip\".
40 To restore the original branch and stop rebasing run \"git rebase --abort\".
45 dotest
=$GIT_DIR/.dotest-merge
51 test -n "$prev_head" || die
"prev_head must be defined"
52 test -d "$dotest" || die
"$dotest directory does not exist"
54 unmerged
=$
(git ls-files
-u)
55 if test -n "$unmerged"
57 echo "You still have unmerged paths in your index"
58 echo "did you forget to use git add?"
62 cmt
=`cat "$dotest/current"`
63 if ! git diff-index
--quiet HEAD
65 if ! git-commit
-C "$cmt"
67 echo "Commit failed, please do not call \"git commit\""
68 echo "directly, but instead do one of the following: "
71 printf "Committed: %0${prec}d " $msgnum
73 printf "Already applied: %0${prec}d " $msgnum
75 git rev-list
--pretty=oneline
-1 "$cmt" |
sed -e 's/^[^ ]* //'
77 prev_head
=`git rev-parse HEAD^0`
78 # save the resulting commit so we can read-tree on it later
79 echo "$prev_head" > "$dotest/prev_head"
81 # onto the next patch:
82 msgnum
=$
(($msgnum + 1))
83 echo "$msgnum" >"$dotest/msgnum"
87 cmt
="$(cat "$dotest/cmt.
$1")"
88 echo "$cmt" > "$dotest/current"
89 hd
=$
(git rev-parse
--verify HEAD
)
90 cmt_name
=$
(git symbolic-ref HEAD
)
91 msgnum
=$
(cat "$dotest/msgnum")
92 end
=$
(cat "$dotest/end")
93 eval GITHEAD_
$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
94 eval GITHEAD_
$hd='$(cat "$dotest/onto_name")'
95 export GITHEAD_
$cmt GITHEAD_
$hd
96 git-merge-
$strategy "$cmt^" -- "$hd" "$cmt"
100 unset GITHEAD_
$cmt GITHEAD_
$hd
108 echo "Strategy: $rv $strategy failed, try another" 1>&2
112 die
"Unknown exit code ($rv) from command:" \
113 "git-merge-$strategy $cmt^ -- HEAD $cmt"
124 test -f "$dotest"/interactive ||
125 while :; do case $#,"$1" in 0,|
*,-i|
*,--interactive) break ;; esac
130 is_interactive
"$@" && exec git-rebase--interactive
"$@"
136 git diff-files
--quiet ||
{
137 echo "You must edit all merge conflicts and then"
138 echo "mark them as resolved using git add"
143 prev_head
=$
(cat "$dotest/prev_head")
144 end
=$
(cat "$dotest/end")
145 msgnum
=$
(cat "$dotest/msgnum")
146 onto
=$
(cat "$dotest/onto")
148 while test "$msgnum" -le "$end"
156 git am
--resolved --3way --resolvemsg="$RESOLVEMSG"
160 git
reset --hard HEAD ||
exit $?
164 prev_head
=$
(cat "$dotest/prev_head")
165 end
=$
(cat "$dotest/end")
166 msgnum
=$
(cat "$dotest/msgnum")
167 msgnum
=$
(($msgnum + 1))
168 onto
=$
(cat "$dotest/onto")
169 while test "$msgnum" -le "$end"
177 git am
-3 --skip --resolvemsg="$RESOLVEMSG"
189 die
"No rebase in progress?"
191 git
reset --hard ORIG_HEAD
195 test 2 -le "$#" || usage
199 -M|
-m|
--m|
--me|
--mer|
--merg|
--merge)
202 -s=*|
--s=*|
--st=*|
--str=*|
--stra=*|
--strat=*|
--strate=*|\
203 --strateg=*|
--strategy=*|\
204 -s|
--s|
--st|
--str|
--stra|
--strat|
--strate|
--strateg|
--strategy)
207 strategy
=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
220 git_am_opt
="$git_am_opt $1"
223 git_am_opt
="$git_am_opt $1"
235 # Make sure we do not have .dotest
236 if test -z "$do_merge"
243 It seems that I cannot create a .dotest directory, and I wonder if you
244 are in the middle of patch application or another rebase. If that is not
245 the case, please rm -fr .dotest and run me again. I am stopping in case
246 you still have something valuable there.'
252 die
"previous dotest directory $dotest still exists." \
253 'try git-rebase < --continue | --abort >'
257 # The tree must be really really clean.
258 git update-index
--refresh ||
exit
259 diff=$
(git diff-index
--cached --name-status -r HEAD
)
261 ?
*) echo "cannot rebase: your index is not up-to-date"
267 # The upstream head must be given. Make sure it is valid.
269 upstream
=`git rev-parse --verify "${upstream_name}^0"` ||
270 die
"invalid upstream $upstream_name"
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 # If a hook exists, give it a chance to interrupt
277 if test -x "$GIT_DIR/hooks/pre-rebase"
279 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} ||
{
280 echo >&2 "The pre-rebase hook refused to rebase."
285 # If the branch to rebase is given, first switch to it.
289 git-checkout
"$2" || usage
292 if branch_name
=`git symbolic-ref -q HEAD`
294 branch_name
=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
296 branch_name
=HEAD
;# detached
300 branch
=$
(git rev-parse
--verify "${branch_name}^0") ||
exit
302 # Now we are rebasing commits $upstream..$branch on top of $onto
304 # Check if we are already based on $onto with linear history,
305 # but this should be done only when upstream and onto are the same.
306 mb
=$
(git merge-base
"$onto" "$branch")
307 if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
309 ! git rev-list
--parents "$onto"..
"$branch" |
grep " .* " > /dev
/null
311 echo >&2 "Current branch $branch_name is up to date."
315 if test -n "$verbose"
317 echo "Changes from $mb to $onto:"
318 # We want color (if set), but no pager
319 GIT_PAGER
='' git
diff --stat --summary "$mb" "$onto"
322 # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.
323 echo "First, rewinding head to replay your work on top of it..."
324 git-reset
--hard "$onto"
326 # If the $onto is a proper descendant of the tip of the branch, then
327 # we just fast forwarded.
328 if test "$mb" = "$branch"
330 echo >&2 "Fast-forwarded $branch_name to $onto_name."
334 if test -z "$do_merge"
336 git format-patch
-k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
337 git am
$git_am_opt --binary -3 -k --resolvemsg="$RESOLVEMSG"
341 # start doing a rebase with git-merge
342 # this is rename-aware if the recursive (default) strategy is used
345 echo "$onto" > "$dotest/onto"
346 echo "$onto_name" > "$dotest/onto_name"
347 prev_head
=`git rev-parse HEAD^0`
348 echo "$prev_head" > "$dotest/prev_head"
351 for cmt
in `git rev-list --reverse --no-merges "$upstream"..ORIG_HEAD`
353 msgnum
=$
(($msgnum + 1))
354 echo "$cmt" > "$dotest/cmt.$msgnum"
357 echo 1 >"$dotest/msgnum"
358 echo $msgnum >"$dotest/end"
363 while test "$msgnum" -le "$end"