diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2009-10-19 14:38:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-19 22:31:00 -0700 |
| commit | 752c0c24926aacbceca0d27de6ad22cbb7dd0709 (patch) | |
| tree | 94fb54e076f11d2ef66d888cd8493e1520639ef3 /Documentation | |
| parent | dbc1b1f71052c084a84b5c395e1cb4b5ae526fcb (diff) | |
| download | git-752c0c24926aacbceca0d27de6ad22cbb7dd0709.tar.gz git-752c0c24926aacbceca0d27de6ad22cbb7dd0709.tar.xz | |
Add the --submodule option to the diff option family
When you use the option --submodule=log you can see the submodule
summaries inlined in the diff, instead of not-quite-helpful SHA-1 pairs.
The format imitates what "git submodule summary" shows.
To do that, <path>/.git/objects/ is added to the alternate object
databases (if that directory exists).
This option was requested by Jens Lehmann at the GitTogether in Berlin.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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. |