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
29 no-verify override pre-rebase hook from stopping the operation
30 root rebase all reachable commmits up to the root(s)
31 autosquash move commits that begin with squash!/fixup! under -i
37 DOTEST="$GIT_DIR/rebase-merge"
39 # The file containing rebase commands, comments, and empty lines.
40 # This file is created by "git rebase -i" then edited by the user. As
41 # the lines are processed, they are removed from the front of this
42 # file and written to the tail of $DONE.
43 TODO="$DOTEST"/git-rebase-todo
45 # The rebase command lines that have already been processed. A line
46 # is moved here when it is first handled, before any associated user
50 # The commit message that is planned to be used for any changes that
51 # need to be committed following a user interaction.
54 # The file into which is accumulated the suggested commit message for
55 # squash/fixup commands. When the first of a series of squash/fixups
56 # is seen, the file is created and the commit message from the
57 # previous commit and from the first squash/fixup commit are written
58 # to it. The commit message for each subsequent squash/fixup commit
59 # is appended to the file as it is processed.
61 # The first line of the file is of the form
62 # # This is a combination of $COUNT commits.
63 # where $COUNT is the number of commits whose messages have been
64 # written to the file so far (including the initial "pick" commit).
65 # Each time that a commit message is processed, this line is read and
66 # updated. It is deleted just before the combined commit is made.
67 SQUASH_MSG="$DOTEST"/message-squash
69 # If the current series of squash/fixups has not yet included a squash
70 # command, then this file exists and holds the commit message of the
71 # original "pick" commit. (If the series ends without a "squash"
72 # command, then this can be used as the commit message of the combined
73 # commit without opening the editor.)
74 FIXUP_MSG="$DOTEST"/message-fixup
76 # $REWRITTEN is the name of a directory containing files for each
77 # commit that is reachable by at least one merge base of $HEAD and
78 # $UPSTREAM. They are not necessarily rewritten, but their children
79 # might be. This ensures that commits on merged, but otherwise
80 # unrelated side branches are left alone. (Think "X" in the man page's
82 REWRITTEN="$DOTEST"/rewritten
84 DROPPED="$DOTEST"/dropped
86 # A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
87 # GIT_AUTHOR_DATE that will be used for the commit that is currently
89 AUTHOR_SCRIPT="$DOTEST"/author-script
91 # When an "edit" rebase command is being processed, the SHA1 of the
92 # commit to be edited is recorded in this file. When "git rebase
93 # --continue" is executed, if there are any staged changes then they
94 # will be amended to the HEAD commit, but only provided the HEAD
95 # commit is still the commit to be edited. When any other rebase
96 # command is processed, this file is deleted.
99 # For the post-rewrite hook, we make a list of rewritten commits and
100 # their new sha1s. The rewritten-pending list keeps the sha1s of
101 # commits that have been processed, but not committed yet,
102 # e.g. because they are waiting for a 'squash' command.
103 REWRITTEN_LIST="$DOTEST"/rewritten-list
104 REWRITTEN_PENDING="$DOTEST"/rewritten-pending
110 OK_TO_SKIP_PRE_REBASE=
114 GIT_CHERRY_PICK_HELP=" After resolving the conflicts,
115 mark the corrected paths with 'git add <paths>', and
116 run 'git rebase --continue'"
117 export GIT_CHERRY_PICK_HELP
128 test $status != 0 && printf "%s\n" "$output"
137 # Output the commit message for the specified commit.
139 git cat-file commit "$1" | sed "1,/^$/d"
142 run_pre_rebase_hook () {
143 if test -z "$OK_TO_SKIP_PRE_REBASE" &&
144 test -x "$GIT_DIR/hooks/pre-rebase"
146 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || {
147 echo >&2 "The pre-rebase hook refused to rebase."
153 require_clean_work_tree () {
154 # test if working tree is dirty
155 git rev-parse --verify HEAD > /dev/null &&
156 git update-index --ignore-submodules --refresh &&
157 git diff-files --quiet --ignore-submodules &&
158 git diff-index --cached --quiet HEAD --ignore-submodules -- ||
159 die "Working tree is dirty"
162 ORIG_REFLOG_ACTION="$GIT_REFLOG_ACTION"
164 comment_for_reflog () {
165 case "$ORIG_REFLOG_ACTION" in
167 GIT_REFLOG_ACTION="rebase -i ($1)"
168 export GIT_REFLOG_ACTION
174 mark_action_done () {
175 sed -e 1q < "$TODO" >> "$DONE"
176 sed -e 1d < "$TODO" >> "$TODO".new
177 mv -f "$TODO".new "$TODO"
178 count=$(sane_grep -c '^[^#]' < "$DONE")
179 total=$(($count+$(sane_grep -c '^[^#]' < "$TODO")))
180 if test "$last_count" != "$count"
183 printf "Rebasing (%d/%d)\r" $count $total
184 test -z "$VERBOSE" || echo
189 sha1_and_parents="$(git rev-list --parents -1 "$1")"
190 case "$sha1_and_parents" in
192 git diff --cc $sha1_and_parents
195 git diff-tree -p "$1^!"
200 esac > "$DOTEST"/patch
202 commit_message "$1" > "$MSG"
203 test -f "$AUTHOR_SCRIPT" ||
204 get_author_ident_from_commit "$1" > "$AUTHOR_SCRIPT"
208 echo "$1" > "$DOTEST"/stopped-sha
220 sane_grep '^[^#]' "$1" >/dev/null
223 # Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
224 # GIT_AUTHOR_DATE exported from the current environment.
227 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
234 case "$1" in -n) sha1=$2; no_ff=t ;; *) sha1=$1 ;; esac
235 output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
236 test -d "$REWRITTEN" &&
237 pick_one_preserving_merges "$@" && return
238 if test -n "$REBASE_ROOT"
240 output git cherry-pick "$@"
243 parent_sha1=$(git rev-parse --verify $sha1^) ||
244 die "Could not get the parent of $sha1"
245 current_sha1=$(git rev-parse --verify HEAD)
246 if test -z "$no_ff" && test "$current_sha1" = "$parent_sha1"
248 output git reset --hard $sha1
249 output warn Fast-forward to $(git rev-parse --short $sha1)
251 output git cherry-pick "$@"
255 pick_one_preserving_merges () {
266 sha1=$(git rev-parse $sha1)
268 if test -f "$DOTEST"/current-commit
270 if test "$fast_forward" = t
272 cat "$DOTEST"/current-commit | while read current_commit
274 git rev-parse HEAD > "$REWRITTEN"/$current_commit
276 rm "$DOTEST"/current-commit ||
277 die "Cannot write current commit's replacement sha1"
281 echo $sha1 >> "$DOTEST"/current-commit
283 # rewrite parents; if none were rewritten, we can fast-forward.
285 pend=" $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)"
286 if test "$pend" = " "
290 while [ "$pend" != "" ]
292 p=$(expr "$pend" : ' \([^ ]*\)')
295 if test -f "$REWRITTEN"/$p
297 new_p=$(cat "$REWRITTEN"/$p)
299 # If the todo reordered commits, and our parent is marked for
300 # rewriting, but hasn't been gotten to yet, assume the user meant to
301 # drop it on top of the current HEAD
304 new_p=$(git rev-parse HEAD)
307 test $p != $new_p && fast_forward=f
308 case "$new_parents" in
310 ;; # do nothing; that parent is already there
312 new_parents="$new_parents $new_p"
316 if test -f "$DROPPED"/$p
319 replacement="$(cat "$DROPPED"/$p)"
320 test -z "$replacement" && replacement=root
321 pend=" $replacement$pend"
323 new_parents="$new_parents $p"
327 case $fast_forward in
329 output warn "Fast-forward to $sha1"
330 output git reset --hard $sha1 ||
331 die "Cannot fast-forward to $sha1"
334 first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
338 # detach HEAD to current parent
339 output git checkout $first_parent 2> /dev/null ||
340 die "Cannot move HEAD to $first_parent"
343 case "$new_parents" in
345 test "a$1" = a-n && die "Refusing to squash a merge: $sha1"
348 author_script=$(get_author_ident_from_commit $sha1)
349 eval "$author_script"
350 msg="$(commit_message $sha1)"
351 # No point in merging the first parent, that's HEAD
352 new_parents=${new_parents# $first_parent}
353 if ! do_with_author output \
354 git merge $STRATEGY -m "$msg" $new_parents
356 printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
357 die_with_patch $sha1 "Error redoing merge $sha1"
359 echo "$sha1 $(git rev-parse HEAD^0)" >> "$REWRITTEN_LIST"
362 output git cherry-pick "$@" ||
363 die_with_patch $sha1 "Could not pick $sha1"
372 *1[0-9]|*[04-9]) echo "$1"th;;
379 update_squash_messages () {
380 if test -f "$SQUASH_MSG"; then
381 mv "$SQUASH_MSG" "$SQUASH_MSG".bak || exit
383 -e "1s/^# This is a combination of \(.*\) commits\./\1/p" \
384 -e "q" < "$SQUASH_MSG".bak)+1))
386 echo "# This is a combination of $COUNT commits."
387 sed -e 1d -e '2,/^./{
389 }' <"$SQUASH_MSG".bak
392 commit_message HEAD > "$FIXUP_MSG" || die "Cannot write $FIXUP_MSG"
395 echo "# This is a combination of 2 commits."
396 echo "# The first commit's message is:"
405 echo "# This is the $(nth_string $COUNT) commit message:"
411 echo "# The $(nth_string $COUNT) commit message will be skipped:"
413 commit_message $2 | sed -e 's/^/# /'
418 peek_next_command () {
419 sed -n -e "/^#/d" -e '/^$/d' -e "s/ .*//p" -e "q" < "$TODO"
422 # A squash/fixup has failed. Prepare the long version of the squash
423 # commit message, then die_with_patch. This code path requires the
424 # user to edit the combined commit message for all commits that have
425 # been squashed/fixedup so far. So also erase the old squash
426 # messages, effectively causing the combined commit to be used as the
427 # new basis for any further squash/fixups. Args: sha1 rest
428 die_failed_squash() {
429 mv "$SQUASH_MSG" "$MSG" || exit
431 cp "$MSG" "$GIT_DIR"/MERGE_MSG || exit
433 warn "Could not apply $1... $2"
437 flush_rewritten_pending() {
438 test -s "$REWRITTEN_PENDING" || return
439 newsha1="$(git rev-parse HEAD^0)"
440 sed "s/$/ $newsha1/" < "$REWRITTEN_PENDING" >> "$REWRITTEN_LIST"
441 rm -f "$REWRITTEN_PENDING"
444 record_in_rewritten() {
445 oldsha1="$(git rev-parse $1)"
446 echo "$oldsha1" >> "$REWRITTEN_PENDING"
448 case "$(peek_next_command)" in
452 flush_rewritten_pending
458 rm -f "$MSG" "$AUTHOR_SCRIPT" "$AMEND" || exit
459 read command sha1 rest < "$TODO"
465 comment_for_reflog pick
469 die_with_patch $sha1 "Could not apply $sha1... $rest"
470 record_in_rewritten $sha1
473 comment_for_reflog reword
477 die_with_patch $sha1 "Could not apply $sha1... $rest"
478 git commit --amend --no-post-rewrite
479 record_in_rewritten $sha1
482 comment_for_reflog edit
486 die_with_patch $sha1 "Could not apply $sha1... $rest"
487 echo "$sha1" > "$DOTEST"/stopped-sha
489 git rev-parse --verify HEAD > "$AMEND"
490 warn "Stopped at $sha1... $rest"
491 warn "You can amend the commit now, with"
493 warn " git commit --amend"
495 warn "Once you are satisfied with your changes, run"
497 warn " git rebase --continue"
510 comment_for_reflog $squash_style
512 test -f "$DONE" && has_action "$DONE" ||
513 die "Cannot '$squash_style' without a previous commit"
516 update_squash_messages $squash_style $sha1
517 author_script=$(get_author_ident_from_commit HEAD)
518 echo "$author_script" > "$AUTHOR_SCRIPT"
519 eval "$author_script"
520 output git reset --soft HEAD^
521 pick_one -n $sha1 || die_failed_squash $sha1 "$rest"
522 case "$(peek_next_command)" in
524 # This is an intermediate commit; its message will only be
525 # used in case of trouble. So use the long version:
526 do_with_author output git commit --no-verify -F "$SQUASH_MSG" ||
527 die_failed_squash $sha1 "$rest"
530 # This is the final command of this squash/fixup group
531 if test -f "$FIXUP_MSG"
533 do_with_author git commit --no-verify -F "$FIXUP_MSG" ||
534 die_failed_squash $sha1 "$rest"
536 cp "$SQUASH_MSG" "$GIT_DIR"/SQUASH_MSG || exit
537 rm -f "$GIT_DIR"/MERGE_MSG
538 do_with_author git commit --no-verify -e ||
539 die_failed_squash $sha1 "$rest"
541 rm -f "$SQUASH_MSG" "$FIXUP_MSG"
544 record_in_rewritten $sha1
547 warn "Unknown command: $command $sha1 $rest"
548 if git rev-parse --verify -q "$sha1" >/dev/null
550 die_with_patch $sha1 "Please fix this in the file $TODO."
552 die "Please fix this in the file $TODO."
556 test -s "$TODO" && return
558 comment_for_reflog finish &&
559 HEADNAME=$(cat "$DOTEST"/head-name) &&
560 OLDHEAD=$(cat "$DOTEST"/head) &&
561 SHORTONTO=$(git rev-parse --short $(cat "$DOTEST"/onto)) &&
562 NEWHEAD=$(git rev-parse HEAD) &&
565 message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO" &&
566 git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
567 git symbolic-ref HEAD $HEADNAME
570 test ! -f "$DOTEST"/verbose ||
571 git diff-tree --stat $(cat "$DOTEST"/head)..HEAD
574 git notes copy --for-rewrite=rebase < "$REWRITTEN_LIST" ||
575 true # we don't care if this copying failed
577 if test -x "$GIT_DIR"/hooks/post-rewrite &&
578 test -s "$REWRITTEN_LIST"; then
579 "$GIT_DIR"/hooks/post-rewrite rebase < "$REWRITTEN_LIST"
580 true # we don't care if this hook failed
584 warn "Successfully rebased and updated $HEADNAME."
596 # skip picking commits whose parents are unchanged
597 skip_unnecessary_picks () {
599 while read command sha1 rest
601 # fd=3 means we skip the command
602 case "$fd,$command,$(git rev-parse --verify --quiet $sha1^)" in
603 3,pick,"$ONTO"*|3,p,"$ONTO"*)
604 # pick a commit whose parent is current $ONTO -> skip
614 echo "$command${sha1:+ }$sha1${rest:+ }$rest" >&$fd
615 done <"$TODO" >"$TODO.new" 3>>"$DONE" &&
616 mv -f "$TODO".new "$TODO" &&
617 case "$(peek_next_command)" in
619 record_in_rewritten "$ONTO"
622 die "Could not skip unnecessary pick commands"
625 # check if no other options are set
627 test $# -eq 2 -a "$2" = '--' &&
629 test -z "$PRESERVE_MERGES" &&
630 test -z "$STRATEGY" &&
634 get_saved_options () {
635 test -d "$REWRITTEN" && PRESERVE_MERGES=t
636 test -f "$DOTEST"/strategy && STRATEGY="$(cat "$DOTEST"/strategy)"
637 test -f "$DOTEST"/verbose && VERBOSE=t
638 test -f "$DOTEST"/rebase-root && REBASE_ROOT=t
641 # Rearrange the todo list that has both "pick sha1 msg" and
642 # "pick sha1 fixup!/squash! msg" appears in it so that the latter
643 # comes immediately after the former, and change "pick" to
645 rearrange_squash () {
646 sed -n -e 's/^pick \([0-9a-f]*\) \(squash\)! /\1 \2 /p' \
647 -e 's/^pick \([0-9a-f]*\) \(fixup\)! /\1 \2 /p' \
649 test -s "$1.sq" || return
652 while read pick sha1 message
655 *" $sha1 "*) continue ;;
657 echo "$pick $sha1 $message"
658 while read squash action msg
662 echo "$action $squash $action! $msg"
667 done >"$1.rearranged" <"$1"
668 cat "$1.rearranged" >"$1"
669 rm -f "$1.sq" "$1.rearranged"
677 if left=${1%...*} right=${1#*...} &&
678 onto=$(git merge-base --all ${left:-HEAD} ${right:-HEAD})
688 git rev-parse --verify "$1^0"
695 OK_TO_SKIP_PRE_REBASE=yes
700 is_standalone "$@" || usage
702 comment_for_reflog continue
704 test -d "$DOTEST" || die "No interactive rebase running"
707 git rev-parse --verify HEAD >/dev/null ||
708 die "Cannot read HEAD"
709 git update-index --ignore-submodules --refresh &&
710 git diff-files --quiet --ignore-submodules ||
711 die "Working tree is dirty"
713 # do we have anything to commit?
714 if git diff-index --cached --quiet --ignore-submodules HEAD --
716 : Nothing to commit -- skip this
718 . "$AUTHOR_SCRIPT" ||
719 die "Cannot find the author identity"
723 amend=$(git rev-parse --verify HEAD)
724 test "$amend" = $(cat "$AMEND") ||
726 You have uncommitted changes in your working tree. Please, commit them
727 first and then run 'git rebase --continue' again."
728 git reset --soft HEAD^ ||
729 die "Cannot rewind the HEAD"
731 do_with_author git commit --no-verify -F "$MSG" -e || {
732 test -n "$amend" && git reset --soft $amend
733 die "Could not commit staged changes."
737 record_in_rewritten "$(cat "$DOTEST"/stopped-sha)"
739 require_clean_work_tree
743 is_standalone "$@" || usage
745 comment_for_reflog abort
748 test -d "$DOTEST" || die "No interactive rebase running"
750 HEADNAME=$(cat "$DOTEST"/head-name)
751 HEAD=$(cat "$DOTEST"/head)
754 git symbolic-ref HEAD $HEADNAME
757 output git reset --hard $HEAD &&
762 is_standalone "$@" || usage
764 comment_for_reflog skip
767 test -d "$DOTEST" || die "No interactive rebase running"
769 output git reset --hard && do_rest
774 STRATEGY="-s "$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
783 # we use merge anyway
802 ONTO=$(parse_onto "$1") ||
803 die "Does not point to a valid commit: $1"
807 test -z "$REBASE_ROOT" -a $# -ge 1 -a $# -le 2 ||
808 test ! -z "$REBASE_ROOT" -a $# -le 1 || usage
810 die "Interactive rebase already started"
812 git var GIT_COMMITTER_IDENT >/dev/null ||
813 die "You need to set your committer info first"
815 if test -z "$REBASE_ROOT"
818 UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base"
819 test -z "$ONTO" && ONTO=$UPSTREAM
825 die "You must specify --onto when using --root"
827 run_pre_rebase_hook "$UPSTREAM_ARG" "$@"
829 comment_for_reflog start
831 require_clean_work_tree
835 output git show-ref --verify --quiet "refs/heads/$1" ||
836 die "Invalid branchname: $1"
837 output git checkout "$1" ||
838 die "Could not checkout $1"
841 HEAD=$(git rev-parse --verify HEAD) || die "No HEAD?"
842 mkdir "$DOTEST" || die "Could not create temporary $DOTEST"
844 : > "$DOTEST"/interactive || die "Could not mark as interactive"
845 git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
846 echo "detached HEAD" > "$DOTEST"/head-name
848 echo $HEAD > "$DOTEST"/head
849 case "$REBASE_ROOT" in
851 rm -f "$DOTEST"/rebase-root ;;
853 : >"$DOTEST"/rebase-root ;;
855 echo $ONTO > "$DOTEST"/onto
856 test -z "$STRATEGY" || echo "$STRATEGY" > "$DOTEST"/strategy
857 test t = "$VERBOSE" && : > "$DOTEST"/verbose
858 if test t = "$PRESERVE_MERGES"
860 if test -z "$REBASE_ROOT"
862 mkdir "$REWRITTEN" &&
863 for c in $(git merge-base --all $HEAD $UPSTREAM)
865 echo $ONTO > "$REWRITTEN"/$c ||
866 die "Could not init rewritten commits"
869 mkdir "$REWRITTEN" &&
870 echo $ONTO > "$REWRITTEN"/root ||
871 die "Could not init rewritten commits"
873 # No cherry-pick because our first pass is to determine
874 # parents to rewrite and skipping dropped commits would
875 # prematurely end our probe
877 first_after_upstream="$(git rev-list --reverse --first-parent $UPSTREAM..$HEAD | head -n 1)"
879 MERGES_OPTION="--no-merges --cherry-pick"
882 SHORTHEAD=$(git rev-parse --short $HEAD)
883 SHORTONTO=$(git rev-parse --short $ONTO)
884 if test -z "$REBASE_ROOT"
885 # this is now equivalent to ! -z "$UPSTREAM"
887 SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM)
888 REVISIONS=$UPSTREAM...$HEAD
889 SHORTREVISIONS=$SHORTUPSTREAM..$SHORTHEAD
891 REVISIONS=$ONTO...$HEAD
892 SHORTREVISIONS=$SHORTHEAD
894 git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
895 --abbrev=7 --reverse --left-right --topo-order \
897 sed -n "s/^>//p" | while read shortsha1 rest
899 if test t != "$PRESERVE_MERGES"
901 echo "pick $shortsha1 $rest" >> "$TODO"
903 sha1=$(git rev-parse $shortsha1)
904 if test -z "$REBASE_ROOT"
907 for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)
909 if test -f "$REWRITTEN"/$p -a \( $p != $ONTO -o $sha1 = $first_after_upstream \)
917 if test f = "$preserve"
919 touch "$REWRITTEN"/$sha1
920 echo "pick $shortsha1 $rest" >> "$TODO"
925 # Watch for commits that been dropped by --cherry-pick
926 if test t = "$PRESERVE_MERGES"
929 # Save all non-cherry-picked changes
930 git rev-list $REVISIONS --left-right --cherry-pick | \
931 sed -n "s/^>//p" > "$DOTEST"/not-cherry-picks
932 # Now all commits and note which ones are missing in
933 # not-cherry-picks and hence being dropped
934 git rev-list $REVISIONS |
937 if test -f "$REWRITTEN"/$rev -a "$(sane_grep "$rev" "$DOTEST"/not-cherry-picks)" = ""
939 # Use -f2 because if rev-list is telling us this commit is
940 # not worthwhile, we don't want to track its multiple heads,
941 # just the history of its first-parent for others that will
942 # be rebasing on top of it
943 git rev-list --parents -1 $rev | cut -d' ' -s -f2 > "$DROPPED"/$rev
944 short=$(git rev-list -1 --abbrev-commit --abbrev=7 $rev)
945 sane_grep -v "^[a-z][a-z]* $short" <"$TODO" > "${TODO}2" ; mv "${TODO}2" "$TODO"
951 test -s "$TODO" || echo noop >> "$TODO"
952 test -n "$AUTOSQUASH" && rearrange_squash "$TODO"
953 cat >> "$TODO" << EOF
955 # Rebase $SHORTREVISIONS onto $SHORTONTO
958 # p, pick = use commit
959 # r, reword = use commit, but edit the commit message
960 # e, edit = use commit, but stop for amending
961 # s, squash = use commit, but meld into previous commit
962 # f, fixup = like "squash", but discard this commit's log message
964 # If you remove a line here THAT COMMIT WILL BE LOST.
965 # However, if you remove everything, the rebase will be aborted.
969 has_action "$TODO" ||
970 die_abort "Nothing to do"
972 cp "$TODO" "$TODO".backup
973 git_editor "$TODO" ||
974 die_abort "Could not execute editor"
976 has_action "$TODO" ||
977 die_abort "Nothing to do"
979 test -d "$REWRITTEN" || skip_unnecessary_picks
981 git update-ref ORIG_HEAD $HEAD
982 output git checkout $ONTO && do_rest