From: Miklos Vajna <vmiklos@frugalware.org>
Date: Wed, 02 Dec 2009 15:54:46 GMT
Subject: Re: [BUG?] git-merge appends extra string to user's message?
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:
> % 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.