From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Mar 2018 20:53:56 GMT
Subject: Re: Bug With git rebase -p
Message-ID: <xmqqlgenu6qj.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <9a1c2c55ff7f412f8830dbdc4bc033bc@EXMBX02B.bhphotovideo.local>

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 ;-).