diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 15:09:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 15:09:30 -0700 |
| commit | 5193787ca4fbec1fbd47afd14701cc8a3799641e (patch) | |
| tree | 12a9d0bb43ba929ff7c759dd2ee8c94b0a73a1e2 /git-merge.html | |
| parent | 1c05a66ac9af54d408b3d97e791622cbdcf7d8f1 (diff) | |
| download | git-htmldocs-5193787ca4fbec1fbd47afd14701cc8a3799641e.tar.gz | |
Autogenerated HTML docs for v2.22.0-68-g0aae9
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html index a19f588aa..d603608f6 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1132,6 +1132,15 @@ commit or stash your changes before running <em>git merge</em>.</p></div> <code>MERGE_HEAD</code> is present.</p></div>
</dd>
<dt class="hdlist1">
+--quit
+</dt>
+<dd>
+<p>
+ Forget about the current merge in progress. Leave the index
+ and the working tree as-is.
+</p>
+</dd>
+<dt class="hdlist1">
--continue
</dt>
<dd>
@@ -2030,7 +2039,7 @@ branch.<name>.mergeOptions <div id="footer">
<div id="footer-text">
Last updated
- 2019-04-16 05:48:13 PDT
+ 2019-06-13 15:06:39 PDT
</div>
</div>
</body>
|