diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-17 20:24:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-17 20:24:20 -0700 |
| commit | 73c6486c8d3e366bdaeb636e5d1c0ace9957f9d5 (patch) | |
| tree | f435ee542a56ac8c0bced59701339b4b9f87a7e2 /merge-options.txt | |
| parent | 5193787ca4fbec1fbd47afd14701cc8a3799641e (diff) | |
| download | git-htmldocs-73c6486c8d3e366bdaeb636e5d1c0ace9957f9d5.tar.gz | |
Autogenerated HTML docs for v2.22.0-190-ga6a9
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index 61876dbc3..79a00d2a4 100644 --- a/merge-options.txt +++ b/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>:: |