Merge git://git.kernel.org/pub/scm/gitk/gitk

[git.git] / Documentation / git-submodule.txt

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index b4d01605a521279e298d9764ea90f25a8ee367d2..6ffd896fbc78b783a7e00ed462f879cbff29d758 100644 (file)
--- 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] 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
 
 
 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.
 
        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
 -------
 
 OPTIONS
 -------


@@ -57,9 +63,16 @@ OPTIONS
        Branch of repository to add as submodule.
 
 --cached::
        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 unlimited
+       (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
 
 <path>::
        Path to submodule(s). When specified this will restrict the command