diff options
| author |  Richard Hansen <hansenr@google.com> | 2017-01-15 17:16:30 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-15 16:39:12 -0800 |
| commit | 1a5fccc0c26b4a8abafd85a73558022e65f6f8cf (patch) | |
| tree | 6d09751739abbd63882f85c28c282327e81a7f43 | |
| parent | Sync with maint-2.10 (diff) | |
| download | tgif-1a5fccc0c26b4a8abafd85a73558022e65f6f8cf.tar.xz | |
diff: document behavior of relative diff.orderFile
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>
| -rw-r--r-- | Documentation/diff-config.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 58f4bd6afa..bf955852ba 100644 --- 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. + 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:: |