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

Re: [BUG?] git-merge appends extra string to user's message?

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Dec 2, 2009, 15:54 UTC
Message-ID
<20091202155446.GU31763@genesis.frugalware.org>
In-Reply-To
<20091202192030.6117@nanako3.lavabit.com>
On Wed, Dec 02, 2009 at 07:20:30PM +0900, Nanako Shiraishi <nanako3@lavabit.com> wrote:
Show 10 quoted lines
> % git merge -m "Merge early part of side branch" `git rev-parse side~2`
> % git show -s 
> commit 37217141e7519629353738d5e4e677a15096206f
> Merge: e68e646 a1d2374
> Author: ???????????? ????????? <nanako3@lavabit.com>
> Date:   Wed Dec 2 14:33:20 2009 +0900
> 
>     Merge early part of side branch
> 
>     Merge commit 'a1d2374f8f52f4e8a53171601a920b538a6cec23'

At least it's intentional. When I wrote builtin-merge I remember I checked that the script version had this behaviour and that's why I implemented the same way in C.

Previous: Nanako ShiraishiNext: Junio C Hamano
Message 2 of 4 in “[BUG?] git-merge appends extra string to user's message?”
  1. Nanako ShiraishiDec 2, 2009
  2. Miklos VajnaDec 2, 2009
  3. Junio C HamanoDec 2, 2009
  4. Miklos VajnaDec 2, 2009

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.