git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Bug With git rebase -p

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 19, 2018, 20:53 UTC
Message-ID
<xmqqlgenu6qj.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<9a1c2c55ff7f412f8830dbdc4bc033bc@EXMBX02B.bhphotovideo.local>
Joseph Strauss <josephst@bhphoto.com> writes:
Show 9 quoted lines
> 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 ;-).
Previous: Joseph StraussNext: Johannes Schindelin
Message 2 of 8 in “Bug With git rebase -p”
  1. Joseph StraussMar 19, 2018
  2. Junio C HamanoMar 19, 2018
  3. Johannes SchindelinMar 20, 2018
  4. Joseph StraussMar 20, 2018
  5. Johannes SchindelinMar 21, 2018
  6. Junio C HamanoMar 22, 2018
  7. Joseph StraussMar 22, 2018
  8. Johannes SchindelinMar 23, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.