summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorVegard Nossum <vegard.nossum@oracle.com>2017-01-12 12:21:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-01-12 20:55:43 (GMT)
commitc488867793dc9b273c1d35746452d44afcd3d7f5 (patch)
tree2aaada4e2834794bd322cc698c5c9856564ad3bf /Documentation/diff-options.txt
parentd7dffce1cebde29a0c4b309a79e4345450bf352a (diff)
downloadgit-c488867793dc9b273c1d35746452d44afcd3d7f5.zip
git-c488867793dc9b273c1d35746452d44afcd3d7f5.tar.gz
git-c488867793dc9b273c1d35746452d44afcd3d7f5.tar.bz2
diff: add interhunk context config option
The --inter-hunk-context= option was added in commit 6d0e674a5754 ("diff: add option to show context between close hunks"). This patch allows configuring a default for this option. Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index e6215c3..a219aa2 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -511,6 +511,8 @@ endif::git-format-patch[]
--inter-hunk-context=<lines>::
Show the context between diff hunks, up to the specified number
of lines, thereby fusing hunks that are close to each other.
+ Defaults to `diff.interHunkContext` or 0 if the config option
+ is unset.
-W::
--function-context::