git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2a2c18f dd2e36e)
Merge branch 'pw/rebase-i-squash-number-fix'
authorJunio C Hamano <redacted>
Mon, 20 Aug 2018 19:41:33 +0000 (12:41 -0700)
committerJunio C Hamano <redacted>
Mon, 20 Aug 2018 19:41:33 +0000 (12:41 -0700)
commit36fd1e843b83a1ee10178e7da19eee3dee590580
tree1506cc5f569415dae4d436f6f32c34bb604e6b5btree | snapshot
parent2a2c18f1c3ae3fbade32df11719f24e8d6a6709ccommit | diff
parentdd2e36ebaccd6dc2ca4d37759248ce9bbdf9113ecommit | diff
Merge branch 'pw/rebase-i-squash-number-fix'

When "git rebase -i" is told to squash two or more commits into
one, it labeled the log message for each commit with its number.
It correctly called the first one "1st commit", but the next one
was "commit #1", which was off-by-one.  This has been corrected.

* pw/rebase-i-squash-number-fix:
  rebase -i: fix numbering in squash message
sequencer.c diff1 | diff2 | blob | history
t/t3418-rebase-continue.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT