diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-17 15:22:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-17 15:22:57 -0700 |
| commit | c0859f7292882e15477dfc88025e14ce83a625db (patch) | |
| tree | 7ffed07be8918fa7ae147c4a00f1dd23ef64c53e /git-mergetool.html | |
| parent | 20829a4b8e2b66a8e267b82569d850742ce66a6d (diff) | |
| download | git-htmldocs-c0859f7292882e15477dfc88025e14ce83a625db.tar.gz | |
Autogenerated HTML docs for v2.10.1-502-g65988
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index 4eba3be8d..72ee05651 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -843,6 +843,18 @@ success of the resolution after the custom tool has exited.</p></div> to give the user a chance to skip the path.
</p>
</dd>
+<dt class="hdlist1">
+-O<orderfile>
+</dt>
+<dd>
+<p>
+ Process files in the order specified in the
+ <orderfile>, which has one shell glob pattern per line.
+ This overrides the <code>diff.orderFile</code> configuration variable
+ (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>,
+ use <code>-O/dev/null</code>.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -867,7 +879,7 @@ are successfully merged.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-06-03 15:14:46 PDT
+Last updated 2016-10-17 15:22:26 PDT
</div>
</div>
</body>
|