From: Tim Henigan Date: Wed, 14 Mar 2012 17:00:55 +0000 (-0400) Subject: Documentation/diff-options: reword description of --submodule option X-Git-Tag: v1.7.10-rc2~12^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3fe271e91b4d1b9ed0b304e218df8fd419012107;p=git.git 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 --- diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index e26b84706..286d84da4 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.