Skip to main content

Browse the archive

Revision 123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8 authored by Junio C Hamano on 02 November 2005, 03:30:11 UTC, committed by Junio C Hamano on 03 November 2005, 22:55:10 UTC 
Add --no-commit to git-merge/git-pull.
 
With --no-commit flag, git-pull will perform the merge but pretends as
if the merge needed a hand resolve even if automerge cleanly resolves,
to give the user a chance to add further changes and edit the commit
message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent a3114b3
History
File Mode Size
sha1.c -rw-r--r-- 1.4 KB
sha1.h -rw-r--r-- 396 bytes
sha1ppc.S -rw-r--r-- 3.6 KB
back to top