3 # Copyright (c) 2006 Johannes E. Schindelin
7 # This script makes it easy to fix up commits in the middle of a series,
8 # and rearrange commits.
10 # The original idea comes from Eric W. Biederman, in
11 # http://article.gmane.org/gmane.comp.version-control.git/22407
15 git-rebase [-i] [options] [--] <upstream> [<branch>]
16 git-rebase [-i] (--continue | --abort | --skip)
19 v,verbose display a diffstat of what changed upstream
20 onto= rebase onto given branch instead of upstream
21 p,preserve-merges try to recreate merges instead of ignoring them
22 s,strategy= use the given merge strategy
23 m,merge always used (no-op)
24 i,interactive always used (no-op)
26 continue continue rebasing process
27 abort abort rebasing process and restore original branch
28 skip skip current patch and continue rebasing process
34 DOTEST="$GIT_DIR/rebase-merge"
35 TODO="$DOTEST"/git-rebase-todo
38 SQUASH_MSG="$DOTEST"/message-squash
39 REWRITTEN="$DOTEST"/rewritten
40 DROPPED="$DOTEST"/dropped
46 GIT_CHERRY_PICK_HELP=" After resolving the conflicts,
47 mark the corrected paths with 'git add <paths>', and
48 run 'git rebase --continue'"
49 export GIT_CHERRY_PICK_HELP
60 test $status != 0 && printf "%s\n" "$output"
69 run_pre_rebase_hook () {
70 if test -x "$GIT_DIR/hooks/pre-rebase"
72 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || {
73 echo >&2 "The pre-rebase hook refused to rebase."
79 require_clean_work_tree () {
80 # test if working tree is dirty
81 git rev-parse --verify HEAD > /dev/null &&
82 git update-index --ignore-submodules --refresh &&
83 git diff-files --quiet --ignore-submodules &&
84 git diff-index --cached --quiet HEAD --ignore-submodules -- ||
85 die "Working tree is dirty"
88 ORIG_REFLOG_ACTION="$GIT_REFLOG_ACTION"
90 comment_for_reflog () {
91 case "$ORIG_REFLOG_ACTION" in
93 GIT_REFLOG_ACTION="rebase -i ($1)"
94 export GIT_REFLOG_ACTION
100 mark_action_done () {
101 sed -e 1q < "$TODO" >> "$DONE"
102 sed -e 1d < "$TODO" >> "$TODO".new
103 mv -f "$TODO".new "$TODO"
104 count=$(grep -c '^[^#]' < "$DONE")
105 total=$(($count+$(grep -c '^[^#]' < "$TODO")))
106 if test "$last_count" != "$count"
109 printf "Rebasing (%d/%d)\r" $count $total
110 test -z "$VERBOSE" || echo
115 parent_sha1=$(git rev-parse --verify "$1"^) ||
116 die "Cannot get patch for $1^"
117 git diff-tree -p "$parent_sha1".."$1" > "$DOTEST"/patch
118 test -f "$DOTEST"/message ||
119 git cat-file commit "$1" | sed "1,/^$/d" > "$DOTEST"/message
120 test -f "$DOTEST"/author-script ||
121 get_author_ident_from_commit "$1" > "$DOTEST"/author-script
136 grep '^[^#]' "$1" >/dev/null
141 case "$1" in -n) sha1=$2; no_ff=t ;; *) sha1=$1 ;; esac
142 output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
143 test -d "$REWRITTEN" &&
144 pick_one_preserving_merges "$@" && return
145 parent_sha1=$(git rev-parse --verify $sha1^) ||
146 die "Could not get the parent of $sha1"
147 current_sha1=$(git rev-parse --verify HEAD)
148 if test "$no_ff$current_sha1" = "$parent_sha1"; then
149 output git reset --hard $sha1
150 test "a$1" = a-n && output git reset --soft $current_sha1
151 sha1=$(git rev-parse --short $sha1)
152 output warn Fast forward to $sha1
154 output git cherry-pick "$@"
158 pick_one_preserving_merges () {
169 sha1=$(git rev-parse $sha1)
171 if test -f "$DOTEST"/current-commit
173 if [ "$fast_forward" == "t" ]
175 cat "$DOTEST"/current-commit | while read current_commit
177 git rev-parse HEAD > "$REWRITTEN"/$current_commit
179 rm "$DOTEST"/current-commit ||
180 die "Cannot write current commit's replacement sha1"
184 echo $sha1 >> "$DOTEST"/current-commit
186 # rewrite parents; if none were rewritten, we can fast-forward.
188 pend=" $(git rev-list --parents -1 $sha1 | cut -d' ' -f2-)"
189 while [ "$pend" != "" ]
191 p=$(expr "$pend" : ' \([^ ]*\)')
194 if test -f "$REWRITTEN"/$p
196 new_p=$(cat "$REWRITTEN"/$p)
198 # If the todo reordered commits, and our parent is marked for
199 # rewriting, but hasn't been gotten to yet, assume the user meant to
200 # drop it on top of the current HEAD
203 new_p=$(git rev-parse HEAD)
206 test $p != $new_p && fast_forward=f
207 case "$new_parents" in
209 ;; # do nothing; that parent is already there
211 new_parents="$new_parents $new_p"
215 if test -f "$DROPPED"/$p
218 pend=" $(cat "$DROPPED"/$p)$pend"
220 new_parents="$new_parents $p"
224 case $fast_forward in
226 output warn "Fast forward to $sha1"
227 output git reset --hard $sha1 ||
228 die "Cannot fast forward to $sha1"
231 first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
235 # detach HEAD to current parent
236 output git checkout $first_parent 2> /dev/null ||
237 die "Cannot move HEAD to $first_parent"
240 case "$new_parents" in
242 test "a$1" = a-n && die "Refusing to squash a merge: $sha1"
245 author_script=$(get_author_ident_from_commit $sha1)
246 eval "$author_script"
247 msg="$(git cat-file commit $sha1 | sed -e '1,/^$/d')"
248 # No point in merging the first parent, that's HEAD
249 new_parents=${new_parents# $first_parent}
250 if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
251 GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
252 GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
253 output git merge $STRATEGY -m "$msg" \
257 printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
258 die Error redoing merge $sha1
262 output git cherry-pick "$@" ||
263 die_with_patch $sha1 "Could not pick $sha1"
272 *1[0-9]|*[04-9]) echo "$1"th;;
279 make_squash_message () {
280 if test -f "$SQUASH_MSG"; then
281 COUNT=$(($(sed -n "s/^# This is [^0-9]*\([1-9][0-9]*\).*/\1/p" \
282 < "$SQUASH_MSG" | sed -ne '$p')+1))
283 echo "# This is a combination of $COUNT commits."
284 sed -e 1d -e '2,/^./{
289 echo "# This is a combination of two commits."
290 echo "# The first commit's message is:"
292 git cat-file commit HEAD | sed -e '1,/^$/d'
295 echo "# This is the $(nth_string $COUNT) commit message:"
297 git cat-file commit $1 | sed -e '1,/^$/d'
300 peek_next_command () {
301 sed -n "1s/ .*$//p" < "$TODO"
305 rm -f "$DOTEST"/message "$DOTEST"/author-script \
306 "$DOTEST"/amend || exit
307 read command sha1 rest < "$TODO"
313 comment_for_reflog pick
317 die_with_patch $sha1 "Could not apply $sha1... $rest"
320 comment_for_reflog edit
324 die_with_patch $sha1 "Could not apply $sha1... $rest"
326 git rev-parse --verify HEAD > "$DOTEST"/amend
327 warn "Stopped at $sha1... $rest"
328 warn "You can amend the commit now, with"
330 warn " git commit --amend"
332 warn "Once you are satisfied with your changes, run"
334 warn " git rebase --continue"
339 comment_for_reflog squash
341 has_action "$DONE" ||
342 die "Cannot 'squash' without a previous commit"
345 make_squash_message $sha1 > "$MSG"
347 author_script=$(get_author_ident_from_commit HEAD)
348 output git reset --soft HEAD^
349 pick_one -n $sha1 || failed=t
350 case "$(peek_next_command)" in
356 cp "$MSG" "$SQUASH_MSG"
363 rm -f "$SQUASH_MSG" || exit
364 cp "$MSG" "$GIT_DIR"/SQUASH_MSG
365 rm -f "$GIT_DIR"/MERGE_MSG || exit
368 echo "$author_script" > "$DOTEST"/author-script
371 # This is like --amend, but with a different message
372 eval "$author_script"
373 GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
374 GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
375 GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
376 $USE_OUTPUT git commit --no-verify $MSG_OPT "$MSG_FILE" $EDIT_COMMIT || failed=t
380 cp "$MSG" "$GIT_DIR"/MERGE_MSG
382 warn "Could not apply $sha1... $rest"
383 die_with_patch $sha1 ""
387 warn "Unknown command: $command $sha1 $rest"
388 die_with_patch $sha1 "Please fix this in the file $TODO."
391 test -s "$TODO" && return
393 comment_for_reflog finish &&
394 HEADNAME=$(cat "$DOTEST"/head-name) &&
395 OLDHEAD=$(cat "$DOTEST"/head) &&
396 SHORTONTO=$(git rev-parse --short $(cat "$DOTEST"/onto)) &&
397 NEWHEAD=$(git rev-parse HEAD) &&
400 message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
401 git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
402 git symbolic-ref HEAD $HEADNAME
405 test ! -f "$DOTEST"/verbose ||
406 git diff-tree --stat $(cat "$DOTEST"/head)..HEAD
410 warn "Successfully rebased and updated $HEADNAME."
422 # check if no other options are set
424 test $# -eq 2 -a "$2" = '--' &&
426 test -z "$PRESERVE_MERGES" &&
427 test -z "$STRATEGY" &&
431 get_saved_options () {
432 test -d "$REWRITTEN" && PRESERVE_MERGES=t
433 test -f "$DOTEST"/strategy && STRATEGY="$(cat "$DOTEST"/strategy)"
434 test -f "$DOTEST"/verbose && VERBOSE=t
441 is_standalone "$@" || usage
443 comment_for_reflog continue
445 test -d "$DOTEST" || die "No interactive rebase running"
448 git rev-parse --verify HEAD >/dev/null ||
449 die "Cannot read HEAD"
450 git update-index --ignore-submodules --refresh &&
451 git diff-files --quiet --ignore-submodules ||
452 die "Working tree is dirty"
454 # do we have anything to commit?
455 if git diff-index --cached --quiet --ignore-submodules HEAD --
457 : Nothing to commit -- skip this
459 . "$DOTEST"/author-script ||
460 die "Cannot find the author identity"
462 if test -f "$DOTEST"/amend
464 amend=$(git rev-parse --verify HEAD)
465 test "$amend" = $(cat "$DOTEST"/amend) ||
467 You have uncommitted changes in your working tree. Please, commit them
468 first and then run 'git rebase --continue' again."
469 git reset --soft HEAD^ ||
470 die "Cannot rewind the HEAD"
472 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&
473 git commit --no-verify -F "$DOTEST"/message -e || {
474 test -n "$amend" && git reset --soft $amend
475 die "Could not commit staged changes."
479 require_clean_work_tree
483 is_standalone "$@" || usage
485 comment_for_reflog abort
488 test -d "$DOTEST" || die "No interactive rebase running"
490 HEADNAME=$(cat "$DOTEST"/head-name)
491 HEAD=$(cat "$DOTEST"/head)
494 git symbolic-ref HEAD $HEADNAME
497 output git reset --hard $HEAD &&
502 is_standalone "$@" || usage
504 comment_for_reflog skip
507 test -d "$DOTEST" || die "No interactive rebase running"
509 output git reset --hard && do_rest
514 STRATEGY="-s "$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
523 # we use merge anyway
536 ONTO=$(git rev-parse --verify "$1") ||
537 die "Does not point to a valid commit: $1"
541 run_pre_rebase_hook ${1+"$@"}
542 test $# -eq 1 -o $# -eq 2 || usage
544 die "Interactive rebase already started"
546 git var GIT_COMMITTER_IDENT >/dev/null ||
547 die "You need to set your committer info first"
549 comment_for_reflog start
551 require_clean_work_tree
553 UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base"
554 test -z "$ONTO" && ONTO=$UPSTREAM
558 output git show-ref --verify --quiet "refs/heads/$2" ||
559 die "Invalid branchname: $2"
560 output git checkout "$2" ||
561 die "Could not checkout $2"
564 HEAD=$(git rev-parse --verify HEAD) || die "No HEAD?"
565 mkdir "$DOTEST" || die "Could not create temporary $DOTEST"
567 : > "$DOTEST"/interactive || die "Could not mark as interactive"
568 git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
569 echo "detached HEAD" > "$DOTEST"/head-name
571 echo $HEAD > "$DOTEST"/head
572 echo $UPSTREAM > "$DOTEST"/upstream
573 echo $ONTO > "$DOTEST"/onto
574 test -z "$STRATEGY" || echo "$STRATEGY" > "$DOTEST"/strategy
575 test t = "$VERBOSE" && : > "$DOTEST"/verbose
576 if test t = "$PRESERVE_MERGES"
578 # $REWRITTEN contains files for each commit that is
579 # reachable by at least one merge base of $HEAD and
580 # $UPSTREAM. They are not necessarily rewritten, but
581 # their children might be.
582 # This ensures that commits on merged, but otherwise
583 # unrelated side branches are left alone. (Think "X"
584 # in the man page's example.)
585 mkdir "$REWRITTEN" &&
586 for c in $(git merge-base --all $HEAD $UPSTREAM)
588 echo $ONTO > "$REWRITTEN"/$c ||
589 die "Could not init rewritten commits"
591 # No cherry-pick because our first pass is to determine
592 # parents to rewrite and skipping dropped commits would
593 # prematurely end our probe
595 first_after_upstream="$(git rev-list --reverse --first-parent $UPSTREAM..$HEAD | head -n 1)"
597 MERGES_OPTION="--no-merges --cherry-pick"
600 SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM)
601 SHORTHEAD=$(git rev-parse --short $HEAD)
602 SHORTONTO=$(git rev-parse --short $ONTO)
603 git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
604 --abbrev=7 --reverse --left-right --topo-order \
605 $UPSTREAM...$HEAD | \
606 sed -n "s/^>//p" | while read shortsha1 rest
608 if test t != "$PRESERVE_MERGES"
610 echo "pick $shortsha1 $rest" >> "$TODO"
612 sha1=$(git rev-parse $shortsha1)
614 for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -f2-)
616 if test -f "$REWRITTEN"/$p -a \( $p != $UPSTREAM -o $sha1 = $first_after_upstream \)
621 if test f = "$preserve"
623 touch "$REWRITTEN"/$sha1
624 echo "pick $shortsha1 $rest" >> "$TODO"
629 # Watch for commits that been dropped by --cherry-pick
630 if test t = "$PRESERVE_MERGES"
633 # Save all non-cherry-picked changes
634 git rev-list $UPSTREAM...$HEAD --left-right --cherry-pick | \
635 sed -n "s/^>//p" > "$DOTEST"/not-cherry-picks
636 # Now all commits and note which ones are missing in
637 # not-cherry-picks and hence being dropped
638 git rev-list $UPSTREAM...$HEAD --left-right | \
639 sed -n "s/^>//p" | while read rev
641 if test -f "$REWRITTEN"/$rev -a "$(grep "$rev" "$DOTEST"/not-cherry-picks)" = ""
643 # Use -f2 because if rev-list is telling us this commit is
644 # not worthwhile, we don't want to track its multiple heads,
645 # just the history of its first-parent for others that will
646 # be rebasing on top of it
647 git rev-list --parents -1 $rev | cut -d' ' -f2 > "$DROPPED"/$rev
648 cat "$TODO" | grep -v "${rev:0:7}" > "${TODO}2" ; mv "${TODO}2" "$TODO"
653 test -s "$TODO" || echo noop >> "$TODO"
654 cat >> "$TODO" << EOF
656 # Rebase $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO
659 # p, pick = use commit
660 # e, edit = use commit, but stop for amending
661 # s, squash = use commit, but meld into previous commit
663 # If you remove a line here THAT COMMIT WILL BE LOST.
664 # However, if you remove everything, the rebase will be aborted.
668 has_action "$TODO" ||
669 die_abort "Nothing to do"
671 cp "$TODO" "$TODO".backup
672 git_editor "$TODO" ||
673 die "Could not execute editor"
675 has_action "$TODO" ||
676 die_abort "Nothing to do"
678 git update-ref ORIG_HEAD $HEAD
679 output git checkout $ONTO && do_rest