diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-01 19:30:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-03 14:55:10 -0800 |
| commit | 123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8 (patch) | |
| tree | 94780e95e47f6ca7f89c2a2b1e46671178583ed6 /git-merge-ours.sh | |
| parent | a3114b3428595710d4719dd668531210af5993c9 (diff) | |
| download | git-123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8.tar.gz git-123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8.tar.xz | |
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 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions