From: Richard Hansen Date: Sun, 15 Jan 2017 22:16:30 +0000 (-0500) Subject: diff: document behavior of relative diff.orderFile X-Git-Tag: v2.12.0-rc0~46^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a5fccc0c26b4a8abafd85a73558022e65f6f8cf;p=thirdparty%2Fgit.git 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 --- 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::