diff options
| author | Chris Packham <judge.packham@gmail.com> | 2016-12-14 21:37:55 +1300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-14 10:02:04 -0800 |
| commit | 367ff694281ce569edd8f6e444fc770f92f5d215 (patch) | |
| tree | 98ee1a53650ff9ca13010879e0c8ac023549362c /diff-lib.c | |
| parent | 454cb6bd52a4de614a3633e4f547af03d5c3b640 (diff) | |
| download | git-367ff694281ce569edd8f6e444fc770f92f5d215.tar.gz git-367ff694281ce569edd8f6e444fc770f92f5d215.tar.xz | |
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>
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions