Merge branch 'jk/rebase-i-squash-count-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:07 +0000 (13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:07 +0000 (13:32 -0800)
commit2b3f61dc8b5ee4ee5b1c1ad8bdeebce52244a3a6
tree50c13aa2a6b151ebeca032f1303d5e5c7f03d352
parent5fbb42a21ec6169328e081f7b475e4b56152c5b5
parent356b8ecff101e3f763619d74f344ede3204c7991
Merge branch 'jk/rebase-i-squash-count-fix' into maint

"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