diff options
| author |  Vishal Verma <vishal@stellar.sh> | 2019-05-24 12:36:17 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-05-28 11:53:11 -0700 |
| commit | 1d14d0c9949c02260fe4f8b3a54a1b5c605823a2 (patch) | |
| tree | ddafb00ad119393fe27fd594541f757a0fb46270 /Documentation/merge-options.txt | |
| parent | mingw: allow building with an MSYS2 runtime v3.x (diff) | |
| download | tgif-1d14d0c9949c02260fe4f8b3a54a1b5c605823a2.tar.xz | |
merge: refuse --commit with --squash
Convert option_commit to tristate, representing the states of
'default/untouched', 'enabled-by-cli', 'disabled-by-cli'. With this in
place, check whether option_commit was enabled by cli when squashing a
merge. If so, error out, as this is not supported.
Previously, when --squash was supplied, 'option_commit' was silently
dropped. This could have been surprising to a user who tried to override
the no-commit behavior of squash using --commit explicitly.
Add a note to the --squash option for git-merge to clarify the
incompatibility, and add a test case to t7600-merge.sh
Cc: Junio C Hamano <gitster@pobox.com>
Cc: Rafael Ascensão <rafa.almas@gmail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Vishal Verma <vishal@stellar.sh>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 63a3fc0954..a147d436ed 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -90,6 +90,8 @@ merge. + With --no-squash perform the merge and commit the result. This option can be used to override --squash. ++ +With --squash, --commit is not allowed, and will fail. -s <strategy>:: --strategy=<strategy>:: |