From 3fe271e91b4d1b9ed0b304e218df8fd419012107 Mon Sep 17 00:00:00 2001 From: Tim Henigan Date: Wed, 14 Mar 2012 13:00:55 -0400 Subject: Documentation/diff-options: reword description of --submodule option The previous description was confusing. This rewrite makes it easier to understand. Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index e26b84706f..286d84da40 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -88,11 +88,12 @@ endif::git-format-patch[] of the `--diff-filter` option on what the status letters mean. --submodule[=]:: - Chose the output format for submodule differences. can be one of - 'short' and 'log'. 'short' just shows pairs of commit names, this format - is used when this option is not given. 'log' is the default value for this - option and lists the commits in that commit range like the 'summary' - option of linkgit:git-submodule[1] does. + Specify how differences in submodules are shown. When `--submodule` + or `--submodule=log` is given, the 'log' format is used. This format lists + the commits in the range like linkgit:git-submodule[1] `summary` does. + Omitting the `--submodule` option or specifying `--submodule=short`, + uses the 'short' format. This format just shows the names of the commits + at the beginning and end of the range. --color:: Show colored diff. -- cgit v1.2.1