projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a3114b3) | patch
Add --no-commit to git-merge/git-pull.
authorJunio C Hamano <junkio@cox.net>
Wed, 2 Nov 2005 03:30:11 +0000 (19:30 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 3 Nov 2005 22:55:10 +0000 (14:55 -0800)
commit123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8
tree94780e95e47f6ca7f89c2a2b1e46671178583ed6tree | snapshot
parenta3114b3428595710d4719dd668531210af5993c9commit | diff
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>
git-merge.sh diff | blob | history
git-pull.sh diff | blob | history
The core git plumbing