summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2016-12-14 08:37:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-14 18:02:04 (GMT)
commit367ff694281ce569edd8f6e444fc770f92f5d215 (patch)
tree98ee1a53650ff9ca13010879e0c8ac023549362c /t/t7600-merge.sh
parent454cb6bd52a4de614a3633e4f547af03d5c3b640 (diff)
downloadgit-367ff694281ce569edd8f6e444fc770f92f5d215.zip
git-367ff694281ce569edd8f6e444fc770f92f5d215.tar.gz
git-367ff694281ce569edd8f6e444fc770f92f5d215.tar.bz2
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 't/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 85248a1..682139c 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -154,6 +154,8 @@ test_expect_success 'test option parsing' '
test_must_fail git merge -s foobar c1 &&
test_must_fail git merge -s=foobar c1 &&
test_must_fail git merge -m &&
+ test_must_fail git merge --continue foobar &&
+ test_must_fail git merge --continue --quiet &&
test_must_fail git merge
'
@@ -763,4 +765,11 @@ test_expect_success 'merge nothing into void' '
)
'
+test_expect_success 'merge can be completed with --continue' '
+ git reset --hard c0 &&
+ git merge --no-ff --no-commit c1 &&
+ git merge --continue &&
+ verify_parents $c0 $c1
+'
+
test_done