Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [Census] So who uses git?

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:17

Linus Torvalds [off-list ref] 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help