diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-30 16:34:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 16:34:40 +0900 |
| commit | 94d00a5c4ebb12f2552118f261d8f82c05c2501d (patch) | |
| tree | 89cfa22e35b5476dd4ae8ab79277fa6f2eb25557 /git-mergetool.html | |
| parent | a4df8edd688285dc532353d4075d979d5ec20306 (diff) | |
| download | git-htmldocs-94d00a5c4ebb12f2552118f261d8f82c05c2501d.tar.gz | |
Autogenerated HTML docs for v2.19.1-708-g4ede3
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index a5b0ee793..98cc8ee7b 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -845,6 +845,29 @@ success of the resolution after the custom tool has exited.</p></div> </p>
</dd>
<dt class="hdlist1">
+-g
+</dt>
+<dt class="hdlist1">
+--gui
+</dt>
+<dd>
+<p>
+ When <em>git-mergetool</em> is invoked with the <code>-g</code> or <code>--gui</code> option
+ the default merge tool will be read from the configured
+ <code>merge.guitool</code> variable instead of <code>merge.tool</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+--no-gui
+</dt>
+<dd>
+<p>
+ This overrides a previous <code>-g</code> or <code>--gui</code> setting and reads the
+ default merge tool will be read from the configured <code>merge.tool</code>
+ variable.
+</p>
+</dd>
+<dt class="hdlist1">
-O<orderfile>
</dt>
<dd>
@@ -881,7 +904,7 @@ are successfully merged.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2018-10-30 16:33:48 JST
</div>
</div>
</body>
|