From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Jun 2019 17:15:17 +0000 (-0700)
Subject: Merge branch 'vv/merge-squash-with-explicit-commit'
X-Git-Tag: v2.23.0-rc0~118
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6e0b1c60ad3e6067d5cae51a7dc36e58184accd5

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
---

6e0b1c60ad3e6067d5cae51a7dc36e58184accd5