git-submodule: add support for --rebase.

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 035294e2084fa32e608bc3df56d6f89a616b0c33..7c22c409497cbfa403d108e6009ca000acaf771f 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -7,7 +7,7 @@ gitmodules - defining submodule properties
 
 SYNOPSIS
 --------
-gitmodules
+$GIT_WORK_DIR/.gitmodules
 
 
 DESCRIPTION
@@ -15,7 +15,7 @@ DESCRIPTION
 
 The `.gitmodules` file, located in the top-level directory of a git
 working tree, is a text file with a syntax matching the requirements
-of gitlink:git-config[1].
+of linkgit:git-config[1].
 
 The file contains one subsection per submodule, and the subsection value
 is the name of the submodule. Each submodule section also contains the
@@ -30,6 +30,9 @@ submodule.<name>.path::
 submodule.<name>.url::
        Defines an url from where the submodule repository can be cloned.
 
+submodule.<name>.rebase::
+       Defines that the submodule should be rebased by default.
+
 
 EXAMPLES
 --------
@@ -51,7 +54,7 @@ submodules an url is specified which can be used for cloning the submodules.
 
 SEE ALSO
 --------
-gitlink:git-submodule[1] gitlink:git-config[1]
+linkgit:git-submodule[1] linkgit:git-config[1]
 
 DOCUMENTATION
 -------------
@@ -59,4 +62,4 @@ Documentation by Lars Hjemli <hjemli@gmail.com>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite