diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-01 22:05:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-01 22:05:17 +0000 |
| commit | 10b7a34451b2849b893cd1002b8477307873ab30 (patch) | |
| tree | d44ce202644b2ba9d76f5457724bf6193dece835 /git-mergetool.html | |
| parent | bbbb865819d5387ef9ee747115b30b5d2dc7e67b (diff) | |
| download | git-htmldocs-10b7a34451b2849b893cd1002b8477307873ab30.tar.gz | |
Autogenerated HTML docs for v1.6.1-35-g3827
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index 7bbcd0be7..a94269f82 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -320,7 +320,7 @@ git-mergetool(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<div class="para"><p><em>git mergetool</em> [--tool=<tool>] [<file>]…</p></div>
+<div class="para"><p><em>git mergetool</em> [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>]…</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
@@ -372,6 +372,25 @@ variable <tt>mergetool.<tool>.trustExitCode</tt> can be set to <tt>true</t Otherwise, <em>git-mergetool</em> will prompt the user to indicate the
success of the resolution after the custom tool has exited.</p></div>
</dd>
+<dt>
+-y or --no-prompt
+</dt>
+<dd>
+<p>
+ Don't prompt before each invocation of the merge resolution
+ program.
+</p>
+</dd>
+<dt>
+--prompt
+</dt>
+<dd>
+<p>
+ Prompt before each invocation of the merge resolution program.
+ This is the default behaviour; the option is provided to
+ override any configuration settings.
+</p>
+</dd>
</dl></div>
</div>
<h2 id="_author">Author</h2>
@@ -388,7 +407,7 @@ success of the resolution after the custom tool has exited.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-12-10 08:33:20 UTC
+Last updated 2009-01-01 22:04:58 UTC
</div>
</div>
</body>
|