kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

* th/doc-diff-submodule-option:
  Documentation/diff-options: reword description of --submodule option
maint
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
Show Stats 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.

--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.