X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=378f19f0e21d57378cd1913445552456e09b4e51;hb=02f419efcbda05f9923306ae1fcdd754187563fa;hp=7d4566f829e860758328309c377608a1083b0298;hpb=2c54517c1cdbcfe921489407c28c72d0093ab385;p=git.git diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 7d4566f82..378f19f0e 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -165,11 +165,12 @@ any of those replacements occurred. 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.