]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 256d3da 356b8ec)
Merge branch 'jk/rebase-i-squash-count-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 23:12:13 +0000 (15:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 23:12:13 +0000 (15:12 -0800)
"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

1  2 
git-rebase--interactive.sh patch | diff1 | diff2 | blob | history

diff --cc git-rebase--interactive.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.