Merge branch 'jk/rebase-i-squash-count-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2017 23:27:31 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2017 23:27:31 +0000 (15:27 -0800)
commitd6cfc6ace28599554f693b767055b061d81055a8
tree2630e8f01e63e1bd2eb1bc87a3dc8ba9dc92b77a
parent18f909da614a7ffa1d967aafb81fb71b8a6ab6bc
parent356b8ecff101e3f763619d74f344ede3204c7991
Merge branch 'jk/rebase-i-squash-count-fix' into next

"git rebase -i" with a recent update started showing an incorrect
count when squashing more than 10 commits.

* jk/rebase-i-squash-count-fix:
  rebase--interactive: count squash commits above 10 correctly
git-rebase--interactive.sh