diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-15 21:54:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-15 21:54:31 -0700 |
| commit | c58499c317ccb04aba4e0c5b3bee78683027f095 (patch) | |
| tree | 4496df4b21e42d6a483426192f7bc6b33384d4e7 /Documentation/diff-options.txt | |
| parent | 0e2d57fd50f61e668be3180bc8f25991ea88aa8c (diff) | |
| parent | 3fe271e91b4d1b9ed0b304e218df8fd419012107 (diff) | |
| download | git-c58499c317ccb04aba4e0c5b3bee78683027f095.tar.gz git-c58499c317ccb04aba4e0c5b3bee78683027f095.tar.xz | |
Merge branch 'th/doc-diff-submodule-option'
* th/doc-diff-submodule-option:
Documentation/diff-options: reword description of --submodule option
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 11 |
1 files changed, 6 insertions, 5 deletions
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[=<format>]:: - Chose the output format for submodule differences. <format> 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[=<when>]:: Show colored diff. |