diff options
| author |  Ramkumar Ramachandra <artagnon@gmail.com> | 2012-11-13 21:12:45 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-11-18 19:18:13 -0800 |
| commit | c47ef57caaa2b17d32b343fbe652f33b31c81362 (patch) | |
| tree | 9e897701dc452deee919edce5988e7169d430096 /Documentation/diff-config.txt | |
| parent | Documentation: move diff.wordRegex from config.txt to diff-config.txt (diff) | |
| download | tgif-c47ef57caaa2b17d32b343fbe652f33b31c81362.tar.xz | |
diff: introduce diff.submodule configuration variable
Introduce a diff.submodule configuration variable corresponding to the
'--submodule' command-line option of 'git diff'.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-config.txt')
| -rw-r--r-- | Documentation/diff-config.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index decd3701eb..89dd634674 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -107,6 +107,13 @@ diff.suppressBlankEmpty:: A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false. +diff.submodule:: + Specify the format in which differences in submodules are + shown. The "log" format lists the commits in the range like + linkgit:git-submodule[1] `summary` does. The "short" format + format just shows the names of the commits at the beginning + and end of the range. Defaults to short. + diff.wordRegex:: A POSIX Extended Regular Expression used to determine what is a "word" when performing word-by-word difference calculations. Character |