Merge branch 'vv/merge-squash-with-explicit-commit'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:17 +0000 (10:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:17 +0000 (10:15 -0700)
"git merge --squash" is designed to update the working tree and the
index without creating the commit, and this cannot be countermanded
by adding the "--commit" option; the command now refuses to work
when both options are given.

* vv/merge-squash-with-explicit-commit:
merge: refuse --commit with --squash

1  2 
Documentation/merge-options.txt
builtin/merge.c
t/t7600-merge.sh
Simple merge
diff --cc builtin/merge.c
Simple merge
Simple merge