summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-23 14:32:46 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-23 14:32:46 -0700
commit322c6244651c408d924f71f73effd8ed833916d3 (patch)
tree6e8cf8d283e2a923cc330b4b64eeb3c972341edd /diff-options.txt
parent0762262193bb8a218def4fd749a68476d5337b5d (diff)
downloadgit-htmldocs-322c6244651c408d924f71f73effd8ed833916d3.tar.gz
Autogenerated HTML docs for v2.3.4-263-gf53fc
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-options.txt b/diff-options.txt
index 6cb083aae..ccd499867 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -432,8 +432,8 @@ endif::git-format-patch[]
-O<orderfile>::
Output the patch in the order specified in the
<orderfile>, which has one shell glob pattern per line.
- This overrides the `diff.orderfile` configuration variable
- (see linkgit:git-config[1]). To cancel `diff.orderfile`,
+ This overrides the `diff.orderFile` configuration variable
+ (see linkgit:git-config[1]). To cancel `diff.orderFile`,
use `-O/dev/null`.
ifndef::git-format-patch[]