@matheusbsbs / matheus-bagliano / commits / 2185d3b7ad

rebase-interactive: re-word "item count" comment

97f05f43 (Show number of TODO items for interactive rebase, 2014-12-10) taught rebase-interactive to display an item count in the instruction list comments: # Rebase 46640c6..5568fd5 onto 46640c6 (4 TODO item(s)) # # Commands: # p, pick = use commit # ... However, with the exception of the --edit-todo option, "TODO" is a one-off term, never presented to the user by rebase-interactive in any other context. The item count is in fact the number of commands ("pick", "edit", etc.) remaining on the instruction sheet, and the comment immediately following it talks about "Commands". Consequently, replace "(# TODO item(s))" with the more accurate and meaningful "(# command(s))". Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Eric Sunshine committed Mar 4, 2015 at 02:53 UTC 2185d3b7ad2ccdfe220d5c4139ff671a66fe7d80

1 file changed +1 -1

git-rebase--interactive.sh

+1 -1

@@ -1036,7 +1036,7 @@ todocount=${todocount##* }

1036

1037 cat >>"$todo" <<EOF

1038

1039 -$comment_char Rebase $shortrevisions onto $shortonto ($todocount TODO item(s))

1039 +$comment_char Rebase $shortrevisions onto $shortonto ($todocount command(s))

1040 EOF

1041 append_todo_help

1042 git stripspace --comment-lines >>"$todo" <<\EOF