From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 19:41:33 +0000 (-0700)
Subject: Merge branch 'pw/rebase-i-squash-number-fix'
X-Git-Tag: v2.19.0-rc0~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36fd1e843b83a1ee10178e7da19eee3dee590580;p=git

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
---

36fd1e843b83a1ee10178e7da19eee3dee590580