From: Pieter de Bie <pdebie@ai.rug.nl>
Date: Fri, 23 Jan 2009 09:51:41 GMT
Subject: Re: [PATCH 3/3] git commit: pathspec without -i/-o implies -i semantics during a merge
Message-ID: <53513726-CE1C-4487-B775-440C6DC93DD8@ai.rug.nl>
In-Reply-To: <7vy6x235ky.fsf_-_@gitster.siamese.dyndns.org>


On 23 jan 2009, at 06:21, Junio C Hamano wrote:

> This makes "git commit paths..." form default to "git commit -i paths"
> semantics only during a merge, restoring the pre-v1.3.0 behaviour.   
> The
> codepath to create a non-merge commit is not affected and still  
> defaults
> to the "--only" semantics.

Do you really want to do this? I think this is a pretty large change
that can bite users if they don't know about this -- for example,  
because
they forgot that they are in a merge (it happens..).

FWIW, I'd much rather see a useful error message than this change. If
this change does get in, I think it should be well-documented in the
man pages as well as in the release notes.

- Pieter