diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-30 20:16:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-30 20:16:26 -0700 |
| commit | d39d667169fda640065d48b70288c3342bd3195d (patch) | |
| tree | fda6348bfc52ac132837c3f6816addb8bf85c20e /Documentation | |
| parent | e3de372e135e765749426a0165e893283192e38c (diff) | |
| parent | 86140d56c150aa17e6c98dde4ba669516f3c302a (diff) | |
| download | git-d39d667169fda640065d48b70288c3342bd3195d.tar.gz git-d39d667169fda640065d48b70288c3342bd3195d.tar.xz | |
Merge branch 'js/diff-verbose-submodule'
* js/diff-verbose-submodule:
add tests for git diff --submodule
Add the --submodule option to the diff option family
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 9276faeb1..e26b84706 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -87,6 +87,13 @@ endif::git-format-patch[] Show only names and status of changed files. See the description 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. + --color:: Show colored diff. |