From: Junio C Hamano Date: Wed, 01 Feb 2006 00:52:46 GMT Subject: Re: [Census] So who uses git? Message-ID: <7vek2noq75.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Linus Torvalds writes: > 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 ;-). > 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.