git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jan Viktorin <viktorin@rehivetech.com>
Cc: git@vger.kernel.org, Gregory Herrero <gregory.herrero@oracle.com>
Subject: Re: bad behaviour while using git rebase -i -p
Date: Thu, 08 Feb 2018 18:32:28 -0800	[thread overview]
Message-ID: <xmqqtvuq6gg3.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180209013902.6702a0dd@jvn> (Jan Viktorin's message of "Fri, 9 Feb 2018 01:39:02 +0100")

Jan Viktorin <viktorin@rehivetech.com> writes:

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


      reply	other threads:[~2018-02-09  2:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-09  0:39 bad behaviour while using git rebase -i -p Jan Viktorin
2018-02-09  2:32 ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqtvuq6gg3.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gregory.herrero@oracle.com \
    --cc=viktorin@rehivetech.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).