diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-24 02:59:23 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-24 02:59:23 +0300 |
| commit | 831bd5e775ad5225f2a98eba738f69148cd50e0a (patch) | |
| tree | 305316a46768a32e9559a734fdbf25295d632705 /Documentation/diff-config.txt | |
| parent | e11c8261ba70f16b86ec662c027c9be649d9aea4 (diff) | |
| parent | 874444b70451879d5b9b7e288e5c4e711c4a87ac (diff) | |
Merge branch 'rh/diff-orderfile-doc'
Documentation fix.
* rh/diff-orderfile-doc:
diff: document the format of the -O (diff.orderFile) file
diff: document behavior of relative diff.orderFile
Diffstat (limited to 'Documentation/diff-config.txt')
| -rw-r--r-- | Documentation/diff-config.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 15521f5191..cbce8ec638 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -105,9 +105,10 @@ diff.noprefix:: If set, 'git diff' does not show any source or destination prefix. diff.orderFile:: - File indicating how to order files within a diff, using - one shell glob pattern per line. - Can be overridden by the '-O' option to linkgit:git-diff[1]. + File indicating how to order files within a diff. + See the '-O' option to linkgit:git-diff[1] for details. + If `diff.orderFile` is a relative pathname, it is treated as + relative to the top of the working tree. diff.renameLimit:: The number of files to consider when performing the copy/rename |