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
72 git rev-list
--pretty=oneline
-1 HEAD | \
73 sed 's/^[a-f0-9]\+ //'
75 printf "Already applied: %0${prec}d " $msgnum
76 git rev-list
--pretty=oneline
-1 "$cmt" | \
77 sed 's/^[a-f0-9]\+ //'
80 prev_head
=`git rev-parse HEAD^0`
81 # save the resulting commit so we can read-tree on it later
82 echo "$prev_head" > "$dotest/prev_head"
84 # onto the next patch:
85 msgnum
=$
(($msgnum + 1))
86 echo "$msgnum" >"$dotest/msgnum"
90 cmt
="$(cat $dotest/cmt.$1)"
91 echo "$cmt" > "$dotest/current"
92 hd
=$
(git rev-parse
--verify HEAD
)
93 cmt_name
=$
(git symbolic-ref HEAD
)
94 msgnum
=$
(cat $dotest/msgnum
)
95 end
=$
(cat $dotest/end
)
96 eval GITHEAD_
$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
97 eval GITHEAD_
$hd='"$(cat $dotest/onto_name)"'
98 export GITHEAD_
$cmt GITHEAD_
$hd
99 git-merge-
$strategy "$cmt^" -- "$hd" "$cmt"
103 unset GITHEAD_
$cmt GITHEAD_
$hd
111 echo "Strategy: $rv $strategy failed, try another" 1>&2
115 die
"Unknown exit code ($rv) from command:" \
116 "git-merge-$strategy $cmt^ -- HEAD $cmt"
127 test -f "$dotest"/interactive ||
128 while case $#,"$1" in 0,|
*,-i|
*,--interactive) break ;; esac
134 is_interactive
"$@" && exec git-rebase--interactive
"$@"
136 while case "$#" in 0) break ;; esac
140 git diff-files
--quiet ||
{
141 echo "You must edit all merge conflicts and then"
142 echo "mark them as resolved using git add"
147 prev_head
="`cat $dotest/prev_head`"
148 end
="`cat $dotest/end`"
149 msgnum
="`cat $dotest/msgnum`"
150 onto
="`cat $dotest/onto`"
152 while test "$msgnum" -le "$end"
160 git am
--resolved --3way --resolvemsg="$RESOLVEMSG"
167 prev_head
="`cat $dotest/prev_head`"
168 end
="`cat $dotest/end`"
169 msgnum
="`cat $dotest/msgnum`"
170 msgnum
=$
(($msgnum + 1))
171 onto
="`cat $dotest/onto`"
172 while test "$msgnum" -le "$end"
180 git am
-3 --skip --resolvemsg="$RESOLVEMSG"
192 die
"No rebase in progress?"
194 git
reset --hard ORIG_HEAD
198 test 2 -le "$#" || usage
202 -M|
-m|
--m|
--me|
--mer|
--merg|
--merge)
205 -s=*|
--s=*|
--st=*|
--str=*|
--stra=*|
--strat=*|
--strate=*|\
206 --strateg=*|
--strategy=*|\
207 -s|
--s|
--st|
--str|
--stra|
--strat|
--strate|
--strateg|
--strategy)
210 strategy
=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
236 # Make sure we do not have .dotest
237 if test -z "$do_merge"
244 It seems that I cannot create a .dotest directory, and I wonder if you
245 are in the middle of patch application or another rebase. If that is not
246 the case, please rm -fr .dotest and run me again. I am stopping in case
247 you still have something valuable there.'
253 die
"previous dotest directory $dotest still exists." \
254 'try git-rebase < --continue | --abort >'
258 # The tree must be really really clean.
259 git update-index
--refresh ||
exit
260 diff=$
(git diff-index
--cached --name-status -r HEAD
)
262 ?
*) echo "cannot rebase: your index is not up-to-date"
268 # The upstream head must be given. Make sure it is valid.
270 upstream
=`git rev-parse --verify "${upstream_name}^0"` ||
271 die
"invalid upstream $upstream_name"
273 # Make sure the branch to rebase onto is valid.
274 onto_name
=${newbase-"$upstream_name"}
275 onto
=$
(git rev-parse
--verify "${onto_name}^0") ||
exit
277 # If a hook exists, give it a chance to interrupt
278 if test -x "$GIT_DIR/hooks/pre-rebase"
280 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} ||
{
281 echo >&2 "The pre-rebase hook refused to rebase."
286 # If the branch to rebase is given, first switch to it.
290 git-checkout
"$2" || usage
293 if branch_name
=`git symbolic-ref -q HEAD`
295 branch_name
=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
297 branch_name
=HEAD
;# detached
301 branch
=$
(git rev-parse
--verify "${branch_name}^0") ||
exit
303 # Now we are rebasing commits $upstream..$branch on top of $onto
305 # Check if we are already based on $onto with linear history,
306 # but this should be done only when upstream and onto are the same.
307 mb
=$
(git merge-base
"$onto" "$branch")
308 if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
310 ! git rev-list
--parents "$onto"..
"$branch" |
grep " .* " > /dev
/null
312 echo >&2 "Current branch $branch_name is up to date."
316 if test -n "$verbose"
318 echo "Changes from $mb to $onto:"
319 # We want color (if set), but no pager
320 GIT_PAGER
='' git
diff --stat --summary "$mb" "$onto"
323 # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.
324 echo "First, rewinding head to replay your work on top of it..."
325 git-reset
--hard "$onto"
327 # If the $onto is a proper descendant of the tip of the branch, then
328 # we just fast forwarded.
329 if test "$mb" = "$branch"
331 echo >&2 "Fast-forwarded $branch_name to $onto_name."
335 if test -z "$do_merge"
337 git format-patch
-k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
338 git am
$git_am_opt --binary -3 -k --resolvemsg="$RESOLVEMSG"
342 # start doing a rebase with git-merge
343 # this is rename-aware if the recursive (default) strategy is used
346 echo "$onto" > "$dotest/onto"
347 echo "$onto_name" > "$dotest/onto_name"
348 prev_head
=`git rev-parse HEAD^0`
349 echo "$prev_head" > "$dotest/prev_head"
352 for cmt
in `git rev-list --reverse --no-merges "$upstream"..ORIG_HEAD`
354 msgnum
=$
(($msgnum + 1))
355 echo "$cmt" > "$dotest/cmt.$msgnum"
358 echo 1 >"$dotest/msgnum"
359 echo $msgnum >"$dotest/end"
364 while test "$msgnum" -le "$end"