summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2015-03-04 02:53:05 -0500
committerJunio C Hamano <gitster@pobox.com>2015-03-06 12:25:33 -0800
commit2185d3b7ad2ccdfe220d5c4139ff671a66fe7d80 (patch)
tree770668f836518b7657066ee5ed50b5718c7a9acd /git-rebase--interactive.sh
parent28c8cfc3635368f06f6deaedb5e90da328df27d2 (diff)
downloadgit-2185d3b7ad2ccdfe220d5c4139ff671a66fe7d80.tar.gz
rebase-interactive: re-word "item count" commentes/rebase-i-count-todo
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>
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 07512e4563..c5e117a17a 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1036,7 +1036,7 @@ todocount=${todocount##* }
cat >>"$todo" <<EOF
-$comment_char Rebase $shortrevisions onto $shortonto ($todocount TODO item(s))
+$comment_char Rebase $shortrevisions onto $shortonto ($todocount command(s))
EOF
append_todo_help
git stripspace --comment-lines >>"$todo" <<\EOF