From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jul 2019 21:27:10 +0000 (-0700)
Subject: Merge branch 'vv/merge-squash-with-explicit-commit' into maint
X-Git-Tag: v2.23.0-rc0~6^2~16
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=33f2790ecafd29b8551a290e566003b975807c61

Merge branch 'vv/merge-squash-with-explicit-commit' into maint

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

33f2790ecafd29b8551a290e566003b975807c61