summaryrefslogtreecommitdiff
path: root/csum-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-02 03:30:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-03 22:55:10 (GMT)
commit123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8 (patch)
tree94780e95e47f6ca7f89c2a2b1e46671178583ed6 /csum-file.c
parenta3114b3428595710d4719dd668531210af5993c9 (diff)
downloadgit-123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8.zip
git-123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8.tar.gz
git-123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8.tar.bz2
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>
Diffstat (limited to 'csum-file.c')
0 files changed, 0 insertions, 0 deletions