From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Thu, 23 Apr 2009 08:25:11 GMT
Subject: Re: auto commit merge using the default merge message
Message-ID: <49F025E7.7090404@drmicha.warpmail.net>
In-Reply-To: <81b0412b0904230057k1653d039vfc3962e6affda584@mail.gmail.com>

Alex Riesen venit, vidit, dixit 23.04.2009 09:57:
> 2009/4/23 Caleb Cushing <xenoterracide@gmail.com>:
>> so I do the same merge all the time... sorta, I'm not sure rerere
>> would actually work because the file is different each time... I just
>> have to delete it each time. and I want to automate the process.
>> checkout merge rm commmit, problem is commit brings and editor up, I
>> want to commit with the 'auto inserted merge message' that is
>> generated, without seeing the editor, how do I do this?
> 
> See git commit -C <commit-with-fitting-description>,
> git commit -F <message-file> and git commit -m "message text".

I think he wants the auto generated message which may be different for
each merge. Maybe something like

GIT_EDITOR=/bin/true git commit

will do the trick.

Michael