diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-26 01:46:43 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-26 01:46:43 +0400 |
| commit | 079f298513f9875dfd9f2eaaacc58c294c546571 (patch) | |
| tree | 3b8d0b544e33a4aeffd5b961e8971760b4a84679 /Documentation | |
| parent | d6d994d9115ee7ce5bb5ffcfb75fea838174b9c4 (diff) | |
| parent | ef92e1a43632c5b29b89da058f45d9c085ad18b7 (diff) | |
Merge branch 'jl/submodule-summary-diff-files'
* jl/submodule-summary-diff-files:
Documentaqtion/git-submodule.txt: Typofix
git submodule summary: add --files option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-submodule.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 7dd73ae14e..bb7d159179 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -15,7 +15,7 @@ SYNOPSIS 'git submodule' [--quiet] init [--] [<path>...] 'git submodule' [--quiet] update [--init] [-N|--no-fetch] [--rebase] [--reference <repository>] [--merge] [--] [<path>...] -'git submodule' [--quiet] summary [--cached] [--summary-limit <n>] [commit] [--] [<path>...] +'git submodule' [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...] 'git submodule' [--quiet] foreach <command> 'git submodule' [--quiet] sync [--] [<path>...] @@ -127,7 +127,11 @@ summary:: Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the - index or working tree (switched by --cached) are shown. + index or working tree (switched by --cached) are shown. If the option + --files is given, show the series of commits in the submodule between + the index of the super project and the working tree of the submodule + (this option doesn't allow to use the --cached option or to provide an + explicit commit). foreach:: Evaluates an arbitrary shell command in each checked out submodule. @@ -169,6 +173,11 @@ OPTIONS commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead. +--files:: + This option is only valid for the summary command. This command + compares the commit in the index with that in the submodule HEAD + when this option is used. + -n:: --summary-limit:: This option is only valid for the summary command. |