diff options
| author | Vegard Nossum <vegard.nossum@oracle.com> | 2017-01-12 13:21:11 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-12 12:55:43 -0800 |
| commit | c488867793dc9b273c1d35746452d44afcd3d7f5 (patch) | |
| tree | 2aaada4e2834794bd322cc698c5c9856564ad3bf /Documentation | |
| parent | d7dffce1cebde29a0c4b309a79e4345450bf352a (diff) | |
| download | git-c488867793dc9b273c1d35746452d44afcd3d7f5.tar.gz | |
diff: add interhunk context config optionvn/diff-ihc-config
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')
| -rw-r--r-- | Documentation/diff-config.txt | 6 | ||||
| -rw-r--r-- | Documentation/diff-options.txt | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index d8570f2a75..15521f5191 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -60,6 +60,12 @@ diff.context:: Generate diffs with <n> lines of context instead of the default of 3. This value is overridden by the -U option. +diff.interHunkContext:: + Show the context between diff hunks, up to the specified number + of lines, thereby fusing the hunks that are close to each other. + This value serves as the default for the `--inter-hunk-context` + command line option. + diff.external:: If this config variable is set, diff generation is not performed using the internal diff machinery, but using the diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index e6215c372c..a219aa2907 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:: |