Merge branch 'es/rebase-i-count-todo' into maint
commitf63ed085e20da82a8b7b49d90c61d0eb1b2ed19d
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2015 18:23:17 +0000 (23 11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2015 18:23:17 +0000 (23 11:23 -0700)
treed8f29bb6c7f7816999cfed9f690f7b65a81b487f
parent8c2ea51254b41810edf4ee1ac8b2272a784b15df
parent2185d3b7ad2ccdfe220d5c4139ff671a66fe7d80
Merge branch 'es/rebase-i-count-todo' into maint

"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
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh