Perfect. Thank you. -----Original Message----- From: Johannes Schindelin [mailto:Johannes.Schindelin@xxxxxx] Sent: Tuesday, March 20, 2018 10:53 AM To: Junio C Hamano <gitster@xxxxxxxxx> Cc: Joseph Strauss <josephst@xxxxxxxxxxx>; git@xxxxxxxxxxxxxxx Subject: Re: Bug With git rebase -p Hi, On Mon, 19 Mar 2018, Junio C Hamano wrote: > Joseph Strauss <josephst@xxxxxxxxxxx> 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@or > acle.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
