Skip to content

Commit 2185d3b

Browse files
sunshinecogitster
authored andcommitted
rebase-interactive: re-word "item count" comment
97f05f4 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 28c8cfc commit 2185d3b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-rebase--interactive.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ todocount=${todocount##* }
10361036

10371037
cat >>"$todo" <<EOF
10381038
1039-
$comment_char Rebase $shortrevisions onto $shortonto ($todocount TODO item(s))
1039+
$comment_char Rebase $shortrevisions onto $shortonto ($todocount command(s))
10401040
EOF
10411041
append_todo_help
10421042
git stripspace --comment-lines >>"$todo" <<\EOF

0 commit comments

Comments
 (0)