From c47ef57caaa2b17d32b343fbe652f33b31c81362 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Tue, 13 Nov 2012 21:12:45 +0530 Subject: 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 Acked-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/diff-config.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Documentation/diff-config.txt') 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 -- cgit v1.2.1