git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Joseph Strauss <josephst@bhphoto.com>
Cc: "git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Bug With git rebase -p
Date: Mon, 19 Mar 2018 13:53:56 -0700	[thread overview]
Message-ID: <xmqqlgenu6qj.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <9a1c2c55ff7f412f8830dbdc4bc033bc@EXMBX02B.bhphotovideo.local> (Joseph Strauss's message of "Mon, 19 Mar 2018 20:23:48 +0000")

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



  reply	other threads:[~2018-03-19 20:54 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-19 20:23 Bug With git rebase -p Joseph Strauss
2018-03-19 20:53 ` Junio C Hamano [this message]
2018-03-20 14:52   ` Johannes Schindelin
2018-03-20 15:18     ` Joseph Strauss
2018-03-21 22:33       ` Johannes Schindelin
2018-03-22 16:38         ` Junio C Hamano
2018-03-22 16:47           ` Joseph Strauss
2018-03-23  9:39             ` Johannes Schindelin

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=xmqqlgenu6qj.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=josephst@bhphoto.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).