summaryrefslogtreecommitdiff
path: root/Documentation/diff-config.txt
diff options
context:
space:
mode:
authorBrandon Phillips <kelson@shysecurity.com>2015-01-06 11:19:58 -0500
committerJunio C Hamano <gitster@pobox.com>2015-01-07 09:33:11 -0800
commit9579bf1bca1905c53d3faf723183a2d8d3328be4 (patch)
tree3ac93d496f3625a2881341e694bb4c14ac7e82b6 /Documentation/diff-config.txt
parentb48d3f810cd0dc1c9805ea211b4a87ff9fcabdd0 (diff)
downloadgit-bp/diff-relative-config.tar.gz
diff: teach diff.relative to give default to --relative=<value>bp/diff-relative-config
Setting diff.relative configuration variable to true makes 'git diff' behave as if '--relative=true' was passed on the command line. Signed-off-by: Brandon Phillips <kelson@shysecurity.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-config.txt')
-rw-r--r--Documentation/diff-config.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index b001779520..b8a7c600c8 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -103,6 +103,12 @@ diff.orderfile::
one shell glob pattern per line.
Can be overridden by the '-O' option to linkgit:git-diff[1].
+diff.relative::
+ Show pathnames relative to the current directory and exclude
+ changes outside this directory; equivalent to the 'git diff'
+ option '--relative'.
+ Overridden by the '--no-relative' linkgit:git-diff[1] option.
+
diff.renameLimit::
The number of files to consider when performing the copy/rename
detection; equivalent to the 'git diff' option '-l'.