diff options
| author | Richard Hansen <hansenr@google.com> | 2017-01-15 17:16:31 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-15 16:42:16 -0800 |
| commit | 874444b70451879d5b9b7e288e5c4e711c4a87ac (patch) | |
| tree | dd4064f31a2b5aed06dc4e8fd1d80e3806dd1e08 /Documentation/diff-config.txt | |
| parent | 1a5fccc0c26b4a8abafd85a73558022e65f6f8cf (diff) | |
| download | git-874444b70451879d5b9b7e288e5c4e711c4a87ac.tar.gz git-874444b70451879d5b9b7e288e5c4e711c4a87ac.tar.xz | |
diff: document the format of the -O (diff.orderFile) file
Signed-off-by: Richard Hansen <hansenr@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-config.txt')
| -rw-r--r-- | Documentation/diff-config.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index bf955852b..85aca8bbe 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -99,11 +99,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. + 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. - Can be overridden by the '-O' option to linkgit:git-diff[1]. diff.renameLimit:: The number of files to consider when performing the copy/rename |