Re: Bug With git rebase -p
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 20, 2018, 14:52 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1803201551480.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
- In-Reply-To
- <xmqqlgenu6qj.fsf@gitster-ct.c.googlers.com>
Hi,
On Mon, 19 Mar 2018, Junio C Hamano wrote:
Show 18 quoted lines
> Joseph Strauss <josephst@bhphoto.com> writes: > > > I found the following erroneous behavior with "git rebase -p". > > > > My current version is git version 2.16.2.windows.1 > > > > I made an example at GitHub, https://github.com/jkstrauss/git-bug/ > > > > There seem to be two problems when rebasing merge commits with git rebase -p : > > 1. All lines of merge commits' messages get collapse into a single line. > > 2. When an asterisk is present in the middle of the line it gets replaced with the file names of the current directory. > > I suspect that this has already been independently discovered > (twice) and corrected with > > https://public-inbox.org/git/20180208204241.19324-1-gregory.herrero@oracle.com/ > > and is included in v2.17-rc0 (and later ;-).
As it is included in v2.17.0-rc0, Joseph, could you verify that the version at
https://github.com/git-for-windows/git/releases/tag/v2.17.0-rc0.windows.1
fixes this issue for you?
Thanks, Johannes