[PATCH 2/2] rebase-interactive: re-word "item count" comment

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Mar 4, 2015, 07:53 UTC
Message-ID: <1425455585-30186-2-git-send-email-sunshine@sunshineco.com>
In-Reply-To: <1425455585-30186-1-git-send-email-sunshine@sunshineco.com>

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>
---

Junio suggested[1] the wording "# todo items" in place of "# commits" from the original submission, however, I find "(# TODO items)" quite clunky to read. "(# commands)" feels more natural and streamlined, but is also a case of bike-shedding and personal preference, so this patch could easily be dropped.

[1]: http://thread.gmane.org/gmane.comp.version-control.git/259365/focus=261143

 git-rebase--interactive.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index ab98b13..f7deeb0 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1034,7 +1034,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

-- 
2.3.1.340.gf490742