| commit | 367ff694281ce569edd8f6e444fc770f92f5d215 | |
| author | Chris Packham <judge.packham@gmail.com> | |
| Wed, 14 Dec 2016 08:37:55 +0000 (14 21:37 +1300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Dec 2016 18:02:04 +0000 (14 10:02 -0800) | ||
| tree | 98ee1a53650ff9ca13010879e0c8ac023549362c | treesnapshot (tar.gz zip) |
| parent | 454cb6bd52a4de614a3633e4f547af03d5c3b640 | commitdiff |
merge: add '--continue' option as a synonym for 'git commit'
Teach 'git merge' the --continue option which allows 'continuing' a
merge by completing it. The traditional way of completing a merge after
resolving conflicts is to use 'git commit'. Now with commands like 'git
rebase' and 'git cherry-pick' having a '--continue' option adding such
an option to 'git merge' presents a consistent UI.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Teach 'git merge' the --continue option which allows 'continuing' a
merge by completing it. The traditional way of completing a merge after
resolving conflicts is to use 'git commit'. Now with commands like 'git
rebase' and 'git cherry-pick' having a '--continue' option adding such
an option to 'git merge' presents a consistent UI.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge.txt | diffblobblamehistory | |
| builtin/merge.c | diffblobblamehistory | |
| t/t7600-merge.sh | diffblobblamehistory |