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 /git-merge.html | |
| parent | 5193787ca4fbec1fbd47afd14701cc8a3799641e (diff) | |
| download | git-htmldocs-73c6486c8d3e366bdaeb636e5d1c0ace9957f9d5.tar.gz | |
Autogenerated HTML docs for v2.22.0-190-ga6a9
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge.html b/git-merge.html index d603608f6..2aef694ac 100644 --- a/git-merge.html +++ b/git-merge.html @@ -972,6 +972,7 @@ merge.</p></div> </p>
<div class="paragraph"><p>With --no-squash perform the merge and commit the result. This
option can be used to override --squash.</p></div>
+<div class="paragraph"><p>With --squash, --commit is not allowed, and will fail.</p></div>
</dd>
<dt class="hdlist1">
-s <strategy>
|