Junio C Hamano 123ee3ca7b 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>

2005-11-03 14:55:10 -08:00

2.0 KiB

Executable File

Raw Permalink Blame History

View Raw