Re: [Census] So who uses git?

From: Junio C Hamano <junkio@cox.net>
Date: Feb 1, 2006, 00:52 UTC
Message-ID: <7vek2noq75.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0601311623240.7301@g5.osdl.org>

Linus Torvalds <torvalds@osdl.org> writes:

Show 5 quoted lines

> One thing to be careful about is merges.
> ...
> So the current "git commit filename" behaviour is actually the only 
> possible correct one for a merge. Nothing else makes any sense 
> what-so-ever.

Agreed 100%, and I kind of feel silly about not mentioning that myself. It _might_ even make sense to reject explicit filenames when MERGE_HEAD does not exist ;-).

Show 5 quoted lines

> Oh, one final suggestion: if you give a filename to "git
> commit", and you do the new semantics which means something
> _different_ than "do a git-update-index on that file and
> commit", then I'd really suggest that the _old_ index for that
> filename should match the parent exactly.

That is also a good safety measure.