diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-10 12:33:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 12:33:07 -0800 |
| commit | 21bc18b3b222ee68dc0f58c7ff6c92fd44938b2d (patch) | |
| tree | deb6d03b38893fa4dba338ae565980a5086fa585 /git-diff.html | |
| parent | 9906f1f2277410d5f7fedc74ded20e8490812568 (diff) | |
| download | git-htmldocs-21bc18b3b222ee68dc0f58c7ff6c92fd44938b2d.tar.gz | |
Autogenerated HTML docs for v1.8.5.2-309-ga2501
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-diff.html b/git-diff.html index ac9a26949..17c2edc5f 100644 --- a/git-diff.html +++ b/git-diff.html @@ -1540,6 +1540,9 @@ information.</p></div> <p>
Output the patch 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>
<dt class="hdlist1">
|