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)
commit6e0b1c60ad3e6067d5cae51a7dc36e58184accd5
tree030db59bb6a9b059c1cc968e80bcc6fd7dfcabfe
parent3a54d80ac8a1decac6fa158175fb16f0563f5c15
parent1d14d0c9949c02260fe4f8b3a54a1b5c605823a2
Merge branch 'vv/merge-squash-with-explicit-commit'

"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
Documentation/merge-options.txt
builtin/merge.c
t/t7600-merge.sh