Merge branch 'ks/rebase-i-abbrev'

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 6f520d843e6dd4f7fc69b42407fae7f631bb307e..c96b9847e9fc2aaf67997c74a8d5c0abe78b607d 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1029,9 +1029,11 @@ test -s "$todo" || echo noop >> "$todo"
 test -n "$autosquash" && rearrange_squash "$todo"
 test -n "$cmd" && add_exec_commands "$todo"
 
+todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
+
 cat >>"$todo" <<EOF
 
-$comment_char Rebase $shortrevisions onto $shortonto
+$comment_char Rebase $shortrevisions onto $shortonto ($todocount TODO item(s))
 EOF
 append_todo_help
 git stripspace --comment-lines >>"$todo" <<\EOF