diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 21:27:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 21:27:10 (GMT) |
| commit | 33f2790ecafd29b8551a290e566003b975807c61 (patch) | |
| tree | 1fb01d503bc1847a14b4e21cb5cb0a010f9c84ae /Documentation/merge-options.txt | |
| parent | abbd50428e1215933f83a458f2842f5a6e0a21ee (diff) | |
| parent | 1d14d0c9949c02260fe4f8b3a54a1b5c605823a2 (diff) | |
| download | git-33f2790ecafd29b8551a290e566003b975807c61.zip git-33f2790ecafd29b8551a290e566003b975807c61.tar.gz git-33f2790ecafd29b8551a290e566003b975807c61.tar.bz2 | |
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
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 61876db..79a00d2 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -102,6 +102,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>:: |