git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Joseph Strauss <josephst@bhphoto.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Bug With git rebase -p
Date: Mon, 19 Mar 2018 20:23:48 +0000	[thread overview]
Message-ID: <9a1c2c55ff7f412f8830dbdc4bc033bc@EXMBX02B.bhphotovideo.local> (raw)

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.

  


Joseph Kalman Strauss
Lifecycle Management Engineer
B&H Photo
212-239-7500 x2212
josephst@bhphoto.com

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

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-19 20:23 Joseph Strauss [this message]
2018-03-19 20:53 ` Junio C Hamano
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=9a1c2c55ff7f412f8830dbdc4bc033bc@EXMBX02B.bhphotovideo.local \
    --to=josephst@bhphoto.com \
    --cc=git@vger.kernel.org \
    --subject='Re: Bug With git rebase -p' \
    /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

Code repositories for project(s) associated with this 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).