Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
diff: document behavior of relative diff.orderFile
author
Richard Hansen
<hansenr@google.com>
Sun, 15 Jan 2017 22:16:30 +0000
(17:16 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 16 Jan 2017 00:39:12 +0000
(16:39 -0800)
Document that a relative pathname for diff.orderFile is interpreted as
relative to the top-level work directory.
Signed-off-by: Richard Hansen <hansenr@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/diff-config.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
a274e0a
)
diff --git
a/Documentation/diff-config.txt
b/Documentation/diff-config.txt
index 58f4bd6afa12240f9e416860ac12d82776815ee9..bf955852bab40d044eb3507ecfd6332f56e5f025 100644
(file)
--- a/
Documentation/diff-config.txt
+++ b/
Documentation/diff-config.txt
@@
-101,6
+101,8
@@
diff.noprefix::
diff.orderFile::
File indicating how to order files within a diff, using
one shell glob pattern per line.
diff.orderFile::
File indicating how to order files within a diff, using
one shell glob pattern per line.
+ If `diff.orderFile` is a relative pathname, it is treated as
+ relative to the top of the working tree.
Can be overridden by the '-O' option to linkgit:git-diff[1].
diff.renameLimit::
Can be overridden by the '-O' option to linkgit:git-diff[1].
diff.renameLimit::