diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-15 01:10:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-15 01:10:44 -0700 |
| commit | 37bd6c5a2a1dbefdcbc0120451b95f82055f160f (patch) | |
| tree | 6ae9df573bfd1b30a057c088798b18dcb067b593 /Documentation | |
| parent | 1f1e1257a176ce851ffb683bbba505ae22625ec9 (diff) | |
| parent | eed35595759a65d51279547af0f2d017dd928fa5 (diff) | |
| download | git-37bd6c5a2a1dbefdcbc0120451b95f82055f160f.tar.gz | |
Merge branch 'py/submodule'
* py/submodule:
git-submodule summary: fix that some "wc" flavors produce leading spaces
git-submodule summary: test
git-submodule summary: documentation
git-submodule summary: limit summary size
git-submodule summary: show commit summary
git-submodule summary: code framework
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-submodule.txt | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index b4d01605a5..41f9f63566 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -12,6 +12,7 @@ SYNOPSIS 'git-submodule' [--quiet] add [-b branch] [--] <repository> [<path>] 'git-submodule' [--quiet] status [--cached] [--] [<path>...] 'git-submodule' [--quiet] [init|update] [--] [<path>...] +'git-submodule' [--quiet] summary [--summary-limit <n>] [commit] [--] [<path>...] COMMANDS @@ -47,6 +48,11 @@ update:: checkout the commit specified in the index of the containing repository. This will make the submodules HEAD be detached. +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. OPTIONS ------- @@ -57,9 +63,16 @@ OPTIONS Branch of repository to add as submodule. --cached:: - Display the SHA-1 stored in the index, not the SHA-1 of the currently - checked out submodule commit. This option is only valid for the - status command. + This option is only valid for status and summary commands. These + commands typically use the commit found in the submodule HEAD, but + with this option, the commit stored in the index is used instead. + +-n, --summary-limit:: + This option is only valid for the summary command. + Limit the summary size (number of commits shown in total). + Giving 0 will disable the summary; a negative number means unlimted + (the default). This limit only applies to modified submodules. The + size is always limited to 1 for added/deleted/typechanged submodules. <path>:: Path to submodule(s). When specified this will restrict the command |