mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'th/doc-diff-submodule-option'

Browse Source 
* th/doc-diff-submodule-option:
  Documentation/diff-options: reword description of --submodule option
This commit is contained in:
Junio C Hamano
2012-03-15 21:54:30 -07:00
parent 0e2d57fd50 3fe271e91b
commit c58499c317
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/diff-options.txt
View File

@ -165,11 +165,12 @@ any of those replacements occurred.
of the `--diff-filter` option on what the status letters mean. of the `--diff-filter` option on what the status letters mean.
--submodule[=<format>]:: --submodule[=<format>]::
Chose the output format for submodule differences. <format> can be one of Specify how differences in submodules are shown. When `--submodule`
'short' and 'log'. 'short' just shows pairs of commit names, this format or `--submodule=log` is given, the 'log' format is used. This format lists
is used when this option is not given. 'log' is the default value for this the commits in the range like linkgit:git-submodule[1] `summary` does.
option and lists the commits in that commit range like the 'summary' Omitting the `--submodule` option or specifying `--submodule=short`,
option of linkgit:git-submodule[1] does. uses the 'short' format. This format just shows the names of the commits
at the beginning and end of the range.
--color[=<when>]:: --color[=<when>]::
Show colored diff. Show colored diff.