From 874444b70451879d5b9b7e288e5c4e711c4a87ac Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Sun, 15 Jan 2017 17:16:31 -0500 Subject: diff: document the format of the -O (diff.orderFile) file Signed-off-by: Richard Hansen Signed-off-by: Junio C Hamano --- Documentation/diff-config.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Documentation/diff-config.txt') diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index bf955852ba..85aca8bbe8 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 -- cgit v1.2.1