git-rebase--interactive.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Johannes E. Schindelin
   4
   5 # SHORT DESCRIPTION
   6 #
   7 # This script makes it easy to fix up commits in the middle of a series,
   8 # and rearrange commits.
   9 #
  10 # The original idea comes from Eric W. Biederman, in
  11 # http://article.gmane.org/gmane.comp.version-control.git/22407
  12
  13 USAGE='(--continue | --abort | --skip | [--preserve-merges] [--first-parent]
  14         [--preserve-tags] [--verbose] [--onto <branch>] <upstream> [<branch>])'
  15
  16 OPTIONS_SPEC=
  17 . git-sh-setup
  18 require_work_tree
  19
  20 DOTEST="$GIT_DIR/.dotest-merge"
  21 TODO="$DOTEST"/git-rebase-todo
  22 DONE="$DOTEST"/done
  23 MSG="$DOTEST"/message
  24 SQUASH_MSG="$DOTEST"/message-squash
  25 PRESERVE_MERGES=
  26 STRATEGY=
  27 VERBOSE=
  28 test -f "$DOTEST"/strategy && STRATEGY="$(cat "$DOTEST"/strategy)"
  29 test -f "$DOTEST"/verbose && VERBOSE=t
  30
  31 GIT_CHERRY_PICK_HELP="  After resolving the conflicts,
  32 mark the corrected paths with 'git add <paths>', and
  33 run 'git rebase --continue'"
  34 export GIT_CHERRY_PICK_HELP
  35
  36 mark_prefix=refs/rebase-marks/
  37
  38 warn () {
  39         echo "$*" >&2
  40 }
  41
  42 output () {
  43         case "$VERBOSE" in
  44         '')
  45                 output=$("$@" 2>&1 )
  46                 status=$?
  47                 test $status != 0 && printf "%s\n" "$output"
  48                 return $status
  49                 ;;
  50         *)
  51                 "$@"
  52                 ;;
  53         esac
  54 }
  55
  56 require_clean_work_tree () {
  57         # test if working tree is dirty
  58         git rev-parse --verify HEAD > /dev/null &&
  59         git update-index --ignore-submodules --refresh &&
  60         git diff-files --quiet --ignore-submodules &&
  61         git diff-index --cached --quiet HEAD --ignore-submodules -- ||
  62         die "Working tree is dirty"
  63 }
  64
  65 ORIG_REFLOG_ACTION="$GIT_REFLOG_ACTION"
  66
  67 comment_for_reflog () {
  68         case "$ORIG_REFLOG_ACTION" in
  69         ''|rebase*)
  70                 GIT_REFLOG_ACTION="rebase -i ($1)"
  71                 export GIT_REFLOG_ACTION
  72                 ;;
  73         esac
  74 }
  75
  76 last_count=
  77 mark_action_done () {
  78         sed -e 1q < "$TODO" >> "$DONE"
  79         sed -e 1d < "$TODO" >> "$TODO".new
  80         mv -f "$TODO".new "$TODO"
  81         count=$(grep -c '^[^#]' < "$DONE")
  82         total=$(($count+$(grep -c '^[^#]' < "$TODO")))
  83         if test "$last_count" != "$count"
  84         then
  85                 last_count=$count
  86                 printf "Rebasing (%d/%d)\r" $count $total
  87                 test -z "$VERBOSE" || echo
  88         fi
  89 }
  90
  91 make_patch () {
  92         parent_sha1=$(git rev-parse --verify "$1"^) ||
  93                 die "Cannot get patch for $1^"
  94         git diff-tree -p "$parent_sha1".."$1" > "$DOTEST"/patch
  95         test -f "$DOTEST"/message ||
  96                 git cat-file commit "$1" | sed "1,/^$/d" > "$DOTEST"/message
  97         test -f "$DOTEST"/author-script ||
  98                 get_author_ident_from_commit "$1" > "$DOTEST"/author-script
  99 }
 100
 101 die_with_patch () {
 102         make_patch "$1"
 103         git rerere
 104         die "$2"
 105 }
 106
 107 cleanup_before_quit () {
 108         for ref in $(git for-each-ref --format='%(refname)' "${mark_prefix%/}")
 109         do
 110                 git update-ref -d "$ref" "$ref" || return 1
 111         done
 112         rm -rf "$DOTEST"
 113 }
 114
 115 die_abort () {
 116         cleanup_before_quit
 117         die "$1"
 118 }
 119
 120 has_action () {
 121         grep '^[^#]' "$1" >/dev/null
 122 }
 123
 124 redo_merge () {
 125         rm_sha1=$1
 126         shift
 127
 128         eval "$(get_author_ident_from_commit $rm_sha1)"
 129         msg="$(git cat-file commit $rm_sha1 | sed -e '1,/^$/d')"
 130
 131         if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
 132                 GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
 133                 GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
 134                 output git merge $STRATEGY -m "$msg" "$@"
 135         then
 136                 git rerere
 137                 printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
 138                 die Error redoing merge $rm_sha1
 139         fi
 140         unset rm_sha1
 141 }
 142
 143 pick_one () {
 144         no_ff=
 145         case "$1" in -n) sha1=$2; no_ff=t ;; *) sha1=$1 ;; esac
 146         output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
 147         parent_sha1=$(git rev-parse --verify $sha1^) ||
 148                 die "Could not get the parent of $sha1"
 149         current_sha1=$(git rev-parse --verify HEAD)
 150         if test "$no_ff$current_sha1" = "$parent_sha1"; then
 151                 output git reset --hard $sha1
 152                 test "a$1" = a-n && output git reset --soft $current_sha1
 153                 sha1=$(git rev-parse --short $sha1)
 154                 output warn Fast forward to $sha1
 155         else
 156                 output git cherry-pick "$@"
 157         fi
 158 }
 159
 160 nth_string () {
 161         case "$1" in
 162         *1[0-9]|*[04-9]) echo "$1"th;;
 163         *1) echo "$1"st;;
 164         *2) echo "$1"nd;;
 165         *3) echo "$1"rd;;
 166         esac
 167 }
 168
 169 make_squash_message () {
 170         if test -f "$SQUASH_MSG"; then
 171                 COUNT=$(($(sed -n "s/^# This is [^0-9]*\([1-9][0-9]*\).*/\1/p" \
 172                         < "$SQUASH_MSG" | sed -ne '$p')+1))
 173                 echo "# This is a combination of $COUNT commits."
 174                 sed -e 1d -e '2,/^./{
 175                         /^$/d
 176                 }' <"$SQUASH_MSG"
 177         else
 178                 COUNT=2
 179                 echo "# This is a combination of two commits."
 180                 echo "# The first commit's message is:"
 181                 echo
 182                 git cat-file commit HEAD | sed -e '1,/^$/d'
 183         fi
 184         echo
 185         echo "# This is the $(nth_string $COUNT) commit message:"
 186         echo
 187         git cat-file commit $1 | sed -e '1,/^$/d'
 188 }
 189
 190 peek_next_command () {
 191         sed -n "1s/ .*$//p" < "$TODO"
 192 }
 193
 194 mark_to_ref () {
 195         if expr "$1" : "^:[0-9][0-9]*$" >/dev/null
 196         then
 197                 echo "$mark_prefix$(printf %d ${1#:})"
 198         else
 199                 echo "$1"
 200         fi
 201 }
 202
 203 do_next () {
 204         rm -f "$DOTEST"/message "$DOTEST"/author-script \
 205                 "$DOTEST"/amend || exit
 206         read command sha1 rest < "$TODO"
 207         case "$command" in
 208         '#'*|'')
 209                 mark_action_done
 210                 ;;
 211         pick|p)
 212                 comment_for_reflog pick
 213
 214                 mark_action_done
 215                 pick_one $sha1 ||
 216                         die_with_patch $sha1 "Could not apply $sha1... $rest"
 217                 ;;
 218         edit|e)
 219                 comment_for_reflog edit
 220
 221                 mark_action_done
 222                 pick_one $sha1 ||
 223                         die_with_patch $sha1 "Could not apply $sha1... $rest"
 224                 make_patch $sha1
 225                 : > "$DOTEST"/amend
 226                 warn
 227                 warn "You can amend the commit now, with"
 228                 warn
 229                 warn "  git commit --amend"
 230                 warn
 231                 warn "Once you are satisfied with your changes, run"
 232                 warn
 233                 warn "  git rebase --continue"
 234                 warn
 235                 exit 0
 236                 ;;
 237         squash|s)
 238                 comment_for_reflog squash
 239
 240                 has_action "$DONE" ||
 241                         die "Cannot 'squash' without a previous commit"
 242
 243                 mark_action_done
 244                 make_squash_message $sha1 > "$MSG"
 245                 case "$(peek_next_command)" in
 246                 squash|s)
 247                         EDIT_COMMIT=
 248                         USE_OUTPUT=output
 249                         cp "$MSG" "$SQUASH_MSG"
 250                         ;;
 251                 *)
 252                         EDIT_COMMIT=-e
 253                         USE_OUTPUT=
 254                         rm -f "$SQUASH_MSG" || exit
 255                         ;;
 256                 esac
 257
 258                 failed=f
 259                 author_script=$(get_author_ident_from_commit HEAD)
 260                 output git reset --soft HEAD^
 261                 pick_one -n $sha1 || failed=t
 262                 echo "$author_script" > "$DOTEST"/author-script
 263                 if test $failed = f
 264                 then
 265                         # This is like --amend, but with a different message
 266                         eval "$author_script"
 267                         GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
 268                         GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
 269                         GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
 270                         $USE_OUTPUT git commit --no-verify -F "$MSG" $EDIT_COMMIT || failed=t
 271                 fi
 272                 if test $failed = t
 273                 then
 274                         cp "$MSG" "$GIT_DIR"/MERGE_MSG
 275                         warn
 276                         warn "Could not apply $sha1... $rest"
 277                         die_with_patch $sha1 ""
 278                 fi
 279                 ;;
 280         mark)
 281                 mark_action_done
 282
 283                 mark=$(mark_to_ref :${sha1#:})
 284                 test :${sha1#:} = "$mark" && die "Invalid mark '$sha1'"
 285
 286                 git rev-parse --verify "$mark" > /dev/null 2>&1 && \
 287                         warn "mark $sha1 already exist; overwriting it"
 288
 289                 git update-ref "$mark" HEAD || die "update-ref failed"
 290                 ;;
 291         merge|m)
 292                 comment_for_reflog merge
 293
 294                 if ! git rev-parse --verify $sha1 > /dev/null
 295                 then
 296                         die "Invalid reference merge '$sha1' in"
 297                                         "$command $sha1 $rest"
 298                 fi
 299
 300                 new_parents=
 301                 for p in $rest
 302                 do
 303                         new_parents="$new_parents $(mark_to_ref $p)"
 304                 done
 305                 new_parents="${new_parents# }"
 306                 test -n "$new_parents" || \
 307                         die "You forgot to give the parents for the" \
 308                                 "merge $sha1. Please fix it in $TODO"
 309
 310                 mark_action_done
 311                 redo_merge $sha1 $new_parents
 312                 ;;
 313         reset|r)
 314                 comment_for_reflog reset
 315
 316                 tmp=$(git rev-parse --verify "$(mark_to_ref $sha1)") ||
 317                         die "Invalid parent '$sha1' in $command $sha1 $rest"
 318
 319                 mark_action_done
 320                 output git reset --hard $tmp
 321                 ;;
 322         tag|t)
 323                 comment_for_reflog tag
 324
 325                 mark_action_done
 326                 output git tag -f "$sha1"
 327                 ;;
 328         *)
 329                 warn "Unknown command: $command $sha1 $rest"
 330                 die_with_patch $sha1 "Please fix this in the file $TODO."
 331                 ;;
 332         esac
 333         test -s "$TODO" && return
 334
 335         comment_for_reflog finish &&
 336         HEADNAME=$(cat "$DOTEST"/head-name) &&
 337         OLDHEAD=$(cat "$DOTEST"/head) &&
 338         SHORTONTO=$(git rev-parse --short $(cat "$DOTEST"/onto)) &&
 339         NEWHEAD=$(git rev-parse HEAD) &&
 340         case $HEADNAME in
 341         refs/*)
 342                 message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
 343                 git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
 344                 git symbolic-ref HEAD $HEADNAME
 345                 ;;
 346         esac && {
 347                 test ! -f "$DOTEST"/verbose ||
 348                         git diff-tree --stat $(cat "$DOTEST"/head)..HEAD
 349         } &&
 350         cleanup_before_quit &&
 351         git gc --auto &&
 352         warn "Successfully rebased and updated $HEADNAME."
 353
 354         exit
 355 }
 356
 357 do_rest () {
 358         while :
 359         do
 360                 do_next
 361         done
 362 }
 363
 364 get_value_from_list () {
 365         # args: "key" " key1#value1 key2#value2"
 366         case "$2" in
 367         *" $1#"*)
 368                 stm_tmp="${2#* $1#}"
 369                 echo "${stm_tmp%% *}"
 370                 unset stm_tmp
 371                 ;;
 372         *)
 373                 return 1
 374                 ;;
 375         esac
 376 }
 377
 378 insert_value_at_key_into_list () {
 379         # args: "value" "key" " key1#value1 key2#value2"
 380         case "$3 " in
 381         *" $2#$1 "*)
 382                 echo "$3"
 383                 ;;
 384         *" $2#"*)
 385                 echo "$3"
 386                 return 1
 387                 ;;
 388         *)
 389                 echo "$3 $2#$1"
 390                 ;;
 391         esac
 392 }
 393
 394 create_extended_todo_list () {
 395         (
 396         if test t = "${PRESERVE_TAGS:-}"
 397         then
 398                 tag_list=$(git show-ref --abbrev=7 --tags | \
 399                         (
 400                         while read sha1 tag
 401                         do
 402                                 tag=${tag#refs/tags/}
 403                                 if test ${last_sha1:-0000} = $sha1
 404                                 then
 405                                         saved_tags="$saved_tags:$tag"
 406                                 else
 407                                         printf "%s" "${last_sha1:+ $last_sha1#$saved_tags}"
 408                                         last_sha1=$sha1
 409                                         saved_tags=$tag
 410                                 fi
 411                         done
 412                         echo "${last_sha1:+ $last_sha1:$saved_tags}"
 413                         ) )
 414         else
 415                 tag_list=
 416         fi
 417         while IFS=_ read commit parents subject
 418         do
 419                 if test t = "$PRESERVE_MERGES" -a \
 420                         "${last_parent:-$commit}" != "$commit"
 421                 then
 422                         if test t = "${delayed_mark:-f}"
 423                         then
 424                                 marked_commits=$(insert_value_at_key_into_list \
 425                                         dummy $last_parent "${marked_commits:-}")
 426                                 delayed_mark=f
 427                         fi
 428                         test "$last_parent" = $SHORTUPSTREAM && \
 429                                 last_parent=$SHORTONTO
 430                         echo "reset $last_parent"
 431                 fi
 432                 last_parent="${parents%% *}"
 433
 434                 get_value_from_list $commit "${marked_commits:-}" \
 435                         >/dev/null && echo mark
 436
 437                 if tmp=$(get_value_from_list $commit "$tag_list")
 438                 then
 439                         for t in $(echo $tmp | tr : ' ')
 440                         do
 441                                 echo tag $t
 442                         done
 443                 fi
 444
 445                 case "$parents" in
 446                 *' '*)
 447                         delayed_mark=t
 448                         new_parents=
 449                         for p in ${parents#* }
 450                         do
 451                                 marked_commits=$(insert_value_at_key_into_list \
 452                                         dummy "$p" "${marked_commits:-}")
 453                                 if test "$p" = $SHORTUPSTREAM
 454                                 then
 455                                         new_parents="$new_parents $SHORTONTO"
 456                                 else
 457                                         new_parents="$new_parents $p"
 458                                 fi
 459                         done
 460                         unset p
 461                         echo merge $commit $new_parents
 462                         unset new_parents
 463                         ;;
 464                 *)
 465                         echo "pick $commit $subject"
 466                         ;;
 467                 esac
 468         done
 469         test -n "${last_parent:-}" -a "${last_parent:-}" != $SHORTUPSTREAM && \
 470                 echo reset $last_parent
 471         ) | \
 472         perl -e 'print reverse <>' | \
 473         while read cmd args
 474         do
 475                 : ${commit_mark_list:=} ${last_commit:=000}
 476                 case "$cmd" in
 477                 pick)
 478                         last_commit="${args%% *}"
 479                         ;;
 480                 mark)
 481                         : ${next_mark:=0}
 482                         if commit_mark_list=$(insert_value_at_key_into_list \
 483                                 $next_mark $last_commit "$commit_mark_list")
 484                         then
 485                                 args=":$next_mark"
 486                                 next_mark=$(($next_mark + 1))
 487                         else
 488                                 die "Internal error: two marks for" \
 489                                         "the same commit"
 490                         fi
 491                         ;;
 492                 reset)
 493                         if tmp=$(get_value_from_list $args "$commit_mark_list")
 494                         then
 495                                 args=":$tmp"
 496                         fi
 497                         ;;
 498                 merge)
 499                         new_args=
 500                         for i in ${args#* }
 501                         do
 502                                 if tmp=$(get_value_from_list $i \
 503                                         "$commit_mark_list")
 504                                 then
 505                                         new_args="$new_args :$tmp"
 506                                 else
 507                                         new_args="$new_args $i"
 508                                 fi
 509                         done
 510                         last_commit="${args%% *}"
 511                         args="$last_commit ${new_args# }"
 512                         ;;
 513                 esac
 514                 echo "$cmd $args"
 515         done
 516 }
 517
 518 while test $# != 0
 519 do
 520         case "$1" in
 521         --continue)
 522                 comment_for_reflog continue
 523
 524                 test -d "$DOTEST" || die "No interactive rebase running"
 525
 526                 # Sanity check
 527                 git rev-parse --verify HEAD >/dev/null ||
 528                         die "Cannot read HEAD"
 529                 git update-index --ignore-submodules --refresh &&
 530                         git diff-files --quiet --ignore-submodules ||
 531                         die "Working tree is dirty"
 532
 533                 # do we have anything to commit?
 534                 if git diff-index --cached --quiet --ignore-submodules HEAD --
 535                 then
 536                         : Nothing to commit -- skip this
 537                 else
 538                         . "$DOTEST"/author-script ||
 539                                 die "Cannot find the author identity"
 540                         if test -f "$DOTEST"/amend
 541                         then
 542                                 git reset --soft HEAD^ ||
 543                                 die "Cannot rewind the HEAD"
 544                         fi
 545                         export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&
 546                         git commit --no-verify -F "$DOTEST"/message -e ||
 547                         die "Could not commit staged changes."
 548                 fi
 549
 550                 require_clean_work_tree
 551                 do_rest
 552                 ;;
 553         --abort)
 554                 comment_for_reflog abort
 555
 556                 git rerere clear
 557                 test -d "$DOTEST" || die "No interactive rebase running"
 558
 559                 HEADNAME=$(cat "$DOTEST"/head-name)
 560                 HEAD=$(cat "$DOTEST"/head)
 561                 case $HEADNAME in
 562                 refs/*)
 563                         git symbolic-ref HEAD $HEADNAME
 564                         ;;
 565                 esac &&
 566                 output git reset --hard $HEAD &&
 567                 cleanup_before_quit
 568                 exit
 569                 ;;
 570         --skip)
 571                 comment_for_reflog skip
 572
 573                 git rerere clear
 574                 test -d "$DOTEST" || die "No interactive rebase running"
 575
 576                 output git reset --hard && do_rest
 577                 ;;
 578         -s|--strategy)
 579                 case "$#,$1" in
 580                 *,*=*)
 581                         STRATEGY="-s "$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
 582                 1,*)
 583                         usage ;;
 584                 *)
 585                         STRATEGY="-s $2"
 586                         shift ;;
 587                 esac
 588                 ;;
 589         -m|--merge)
 590                 # we use merge anyway
 591                 ;;
 592         -C*)
 593                 die "Interactive rebase uses merge, so $1 does not make sense"
 594                 ;;
 595         -v|--verbose)
 596                 VERBOSE=t
 597                 ;;
 598         -p|--preserve-merges)
 599                 PRESERVE_MERGES=t
 600                 ;;
 601         -f|--first-parent)
 602                 FIRST_PARENT=t
 603                 PRESERVE_MERGES=t
 604                 ;;
 605         -t|--preserve-tags)
 606                 PRESERVE_TAGS=t
 607                 ;;
 608         -i|--interactive)
 609                 # yeah, we know
 610                 ;;
 611         ''|-h)
 612                 usage
 613                 ;;
 614         *)
 615                 test -d "$DOTEST" &&
 616                         die "Interactive rebase already started"
 617
 618                 git var GIT_COMMITTER_IDENT >/dev/null ||
 619                         die "You need to set your committer info first"
 620
 621                 comment_for_reflog start
 622
 623                 ONTO=
 624                 case "$1" in
 625                 --onto)
 626                         ONTO=$(git rev-parse --verify "$2") ||
 627                                 die "Does not point to a valid commit: $2"
 628                         shift; shift
 629                         ;;
 630                 esac
 631
 632                 require_clean_work_tree
 633
 634                 if test ! -z "$2"
 635                 then
 636                         output git show-ref --verify --quiet "refs/heads/$2" ||
 637                                 die "Invalid branchname: $2"
 638                         output git checkout "$2" ||
 639                                 die "Could not checkout $2"
 640                 fi
 641
 642                 HEAD=$(git rev-parse --verify HEAD) || die "No HEAD?"
 643                 UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base"
 644
 645                 mkdir "$DOTEST" || die "Could not create temporary $DOTEST"
 646
 647                 test -z "$ONTO" && ONTO=$UPSTREAM
 648
 649                 : > "$DOTEST"/interactive || die "Could not mark as interactive"
 650                 git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
 651                         echo "detached HEAD" > "$DOTEST"/head-name
 652
 653                 echo $HEAD > "$DOTEST"/head
 654                 echo $UPSTREAM > "$DOTEST"/upstream
 655                 echo $ONTO > "$DOTEST"/onto
 656                 test -z "$STRATEGY" || echo "$STRATEGY" > "$DOTEST"/strategy
 657                 test t = "$VERBOSE" && : > "$DOTEST"/verbose
 658
 659                 SHORTUPSTREAM=$(git rev-parse --short=7 $UPSTREAM)
 660                 SHORTHEAD=$(git rev-parse --short=7 $HEAD)
 661                 SHORTONTO=$(git rev-parse --short=7 $ONTO)
 662                 common_rev_list_opts="--abbrev-commit --abbrev=7
 663                         --left-right --cherry-pick $UPSTREAM...$HEAD"
 664                 if test t = "$PRESERVE_MERGES" -o t = "${FIRST_PARENT:-f}" \
 665                         -o t = "${PRESERVE_TAGS:-}"
 666                 then
 667                         opts=
 668                         test t = "${FIRST_PARENT:-f}" && \
 669                                 opts="$opts --first-parent"
 670                         test t != "$PRESERVE_MERGES" && \
 671                                 opts="$opts --no-merges"
 672                         git rev-list --pretty='format:%h_%p_%s' --topo-order \
 673                                 $opts $common_rev_list_opts | \
 674                                 grep -v ^commit | \
 675                                 create_extended_todo_list
 676                 else
 677                         git rev-list --no-merges --reverse --pretty=oneline \
 678                                  $common_rev_list_opts | sed -n "s/^>/pick /p"
 679                 fi > "$TODO"
 680
 681                 cat >> "$TODO" << EOF
 682
 683 # Rebase $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO
 684 #
 685 # In the todo insn whenever you need to refer to a commit, in addition
 686 # to the usual commit object name, you can use ':mark' syntax to refer
 687 # to a commit previously marked with the 'mark' insn.
 688 #
 689 # Commands:
 690 #  pick = use commit
 691 #  edit = use commit, but stop for amending
 692 #  squash = use commit, but meld into previous commit
 693 #  mark :mark = mark the current HEAD for later reference
 694 #  reset commit = reset HEAD to the commit
 695 #  merge commit-M commit-P ... = redo merge commit-M with the
 696 #         current HEAD and the parents commit-P
 697 #  tag = reset tag to the current HEAD
 698 #
 699 # If you remove a line here THAT COMMIT WILL BE LOST.
 700 # However, if you remove everything, the rebase will be aborted.
 701 #
 702 EOF
 703
 704                 has_action "$TODO" ||
 705                         die_abort "Nothing to do"
 706
 707                 cp "$TODO" "$TODO".backup
 708                 git_editor "$TODO" ||
 709                         die "Could not execute editor"
 710
 711                 has_action "$TODO" ||
 712                         die_abort "Nothing to do"
 713
 714                 output git checkout $ONTO && do_rest
 715                 ;;
 716         esac
 717         shift
 718 done