From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 16 Nov 2006 23:01:36 GMT
Subject: Re: Cleaning up git user-interface warts
Message-ID: <Pine.LNX.4.63.0611170000420.13772@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <20061116075153.GA29363@tigerwolf.bri.st.com>

Hi,

On Thu, 16 Nov 2006, Richard CURNOW wrote:

> In contrast to Linus's case of wanting to record where the remote merge
> came from, I expressly don't want to record that - I want the merge
> commit to describe conceptually what was being merged with what.
> 
> OK, I could use probably use pull with --no-commit, but I've already
> trained my fingers to type out the merge syntax.  They'd be happier with
> 'git merge -m "Merge feature foo with fixes for bar" bar" though.

For the moment, if you forget --no-commit, you can always do a "git-commit 
--amend" -- even with merges.

Hth,
Dscho