Merge branch 'es/rebase-i-count-todo'

"git rebase -i" recently started to include the number of
commits in the insn sheet to be processed, but on a platform
that prepends leading whitespaces to "wc -l" output, the numbers
are shown with extra whitespaces that aren't necessary.

* es/rebase-i-count-todo:
rebase-interactive: re-word "item count" comment
rebase-interactive: suppress whitespace preceding item count

diff --cc git-rebase--interactive.sh
Simple merge

diff --cc t/t3404-rebase-interactive.sh
index a31f7e0430e107c1fbe036ce412d4466fa5bd2c2,5dc2caf3c58d195c239f6bf3627d3d4f469bb81b..034eb35cdf3f13686f10737267567c08e749ad1c
--- 1/t/t3404-rebase-interactive.sh
--- 2/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -1039,11 -1039,13 +1039,20 @@@ test_expect_success 'short SHA-1 collid
        )
  '
  
 +test_expect_success 'respect core.abbrev' '
 +      git config core.abbrev 12 &&
 +      set_cat_todo_editor &&
 +      test_must_fail git rebase -i HEAD~4 >todo-list &&
 +      test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
 +'
 +
+ test_expect_success 'todo count' '
+       write_script dump-raw.sh <<-\EOF &&
+               cat "$1"
+       EOF
+       test_set_editor "$(pwd)/dump-raw.sh" &&
+       git rebase -i HEAD~4 >actual &&
+       grep "^# Rebase ..* onto ..* ([0-9]" actual
+ '
+ 
  test_done