Merge branch 'ad/rebase-i-serie-typofix'

* ad/rebase-i-serie-typofix:
  rebase -i: fix comment typo

diff --cc git-rebase--interactive.sh
index 2563dc52daaf7acbbdba803360f94bfa5040c5b6,6b3f3bbfff1477cb207376bc563208deef1c9f65..437815669f00b5b6639d48364be1e3c21a63696b
--- 1/git-rebase--interactive.sh
--- 2/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -719,10 -773,97 +719,10 @@@ expand_todo_ids() 
  }
  
  collapse_todo_ids() {
 -      transform_todo_ids --short
 -}
 -
 -# Rearrange the todo list that has both "pick sha1 msg" and
 -# "pick sha1 fixup!/squash! msg" appears in it so that the latter
 -# comes immediately after the former, and change "pick" to
 -# "fixup"/"squash".
 -#
 -# Note that if the config has specified a custom instruction format
 -# each log message will be re-retrieved in order to normalize the
 -# autosquash arrangement
 -rearrange_squash () {
 -      # extract fixup!/squash! lines and resolve any referenced sha1's
 -      while read -r pick sha1 message
 -      do
 -              test -z "${format}" || message=$(git log -n 1 --format="%s" ${sha1})
 -              case "$message" in
 -              "squash! "*|"fixup! "*)
 -                      action="${message%%!*}"
 -                      rest=$message
 -                      prefix=
 -                      # skip all squash! or fixup! (but save for later)
 -                      while :
 -                      do
 -                              case "$rest" in
 -                              "squash! "*|"fixup! "*)
 -                                      prefix="$prefix${rest%%!*},"
 -                                      rest="${rest#*! }"
 -                                      ;;
 -                              *)
 -                                      break
 -                                      ;;
 -                              esac
 -                      done
 -                      printf '%s %s %s %s\n' "$sha1" "$action" "$prefix" "$rest"
 -                      # if it's a single word, try to resolve to a full sha1 and
 -                      # emit a second copy. This allows us to match on both message
 -                      # and on sha1 prefix
 -                      if test "${rest#* }" = "$rest"; then
 -                              fullsha="$(git rev-parse -q --verify "$rest" 2>/dev/null)"
 -                              if test -n "$fullsha"; then
 -                                      # prefix the action to uniquely identify this line as
 -                                      # intended for full sha1 match
 -                                      echo "$sha1 +$action $prefix $fullsha"
 -                              fi
 -                      fi
 -              esac
 -      done >"$1.sq" <"$1"
 -      test -s "$1.sq" || return
 -
 -      used=
 -      while read -r pick sha1 message
 -      do
 -              case " $used" in
 -              *" $sha1 "*) continue ;;
 -              esac
 -              printf '%s\n' "$pick $sha1 $message"
 -              test -z "${format}" || message=$(git log -n 1 --format="%s" ${sha1})
 -              used="$used$sha1 "
 -              while read -r squash action msg_prefix msg_content
 -              do
 -                      case " $used" in
 -                      *" $squash "*) continue ;;
 -                      esac
 -                      emit=0
 -                      case "$action" in
 -                      +*)
 -                              action="${action#+}"
 -                              # full sha1 prefix test
 -                              case "$msg_content" in "$sha1"*) emit=1;; esac ;;
 -                      *)
 -                              # message prefix test
 -                              case "$message" in "$msg_content"*) emit=1;; esac ;;
 -                      esac
 -                      if test $emit = 1; then
 -                              if test -n "${format}"
 -                              then
 -                                      msg_content=$(git log -n 1 --format="${format}" ${squash})
 -                              else
 -                                      msg_content="$(echo "$msg_prefix" | sed "s/,/! /g")$msg_content"
 -                              fi
 -                              printf '%s\n' "$action $squash $msg_content"
 -                              used="$used$squash "
 -                      fi
 -              done <"$1.sq"
 -      done >"$1.rearranged" <"$1"
 -      cat "$1.rearranged" >"$1"
 -      rm -f "$1.sq" "$1.rearranged"
 +      git rebase--helper --shorten-ids
  }
  
- # Add commands after a pick or after a squash/fixup serie
+ # Add commands after a pick or after a squash/fixup series
  # in the todo list.
  add_exec_commands () {
        {