From 1a5fccc0c26b4a8abafd85a73558022e65f6f8cf Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Sun, 15 Jan 2017 17:16:30 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/diff-config.txt | 2 ++ 1 file changed, 2 insertions(+) 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:: -- 2.11.4.GIT