Re: bad behaviour while using git rebase -i -p

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 9, 2018, 02:32 UTC
Message-ID: <xmqqtvuq6gg3.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180209013902.6702a0dd@jvn>

Jan Viktorin <viktorin@rehivetech.com> writes:

Show 13 quoted lines

> since Git 2.16.1, I've noticed a bad behaviour of git rebase -i -p. It
> screws up merge commits created with --log (or config merge.log = true)
> in my history.  A good merge commit with message like:
>
>     Merge branch 'test'
>     
>     * test:
>       c
>       b
>
> is changed after rebase (without touching that commit in any way) into:
>
>     Merge branch 'test' a git-rebase-p-test.sh test: c b

I think we saw this problem independently discovered and a fix for it posted today to the list.

    https://public-inbox.org/git/20180208204241.19324-1-gregory.herrero@oracle.com/

Thanks.