about summary refs log tree commit diff
path: root/third_party/git/Documentation/config/diff.txt
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/Documentation/config/diff.txt')
-rw-r--r--third_party/git/Documentation/config/diff.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/third_party/git/Documentation/config/diff.txt b/third_party/git/Documentation/config/diff.txt
index 5afb5a2cbc69..c3ae136eba6d 100644
--- a/third_party/git/Documentation/config/diff.txt
+++ b/third_party/git/Documentation/config/diff.txt
@@ -105,6 +105,10 @@ diff.mnemonicPrefix::
 diff.noprefix::
 	If set, 'git diff' does not show any source or destination prefix.
 
+diff.relative::
+	If set to 'true', 'git diff' does not show changes outside of the directory
+	and show pathnames relative to the current directory.
+
 diff.orderFile::
 	File indicating how to order files within a diff.
 	See the '-O' option to linkgit:git-diff[1] for details.
@@ -189,7 +193,7 @@ diff.guitool::
 include::../mergetools-diff.txt[]
 
 diff.indentHeuristic::
-	Set this option to `true` to enable experimental heuristics
+	Set this option to `false` to disable the default heuristics
 	that shift diff hunk boundaries to make patches easier to read.
 
 diff.algorithm::