X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgitmodules.txt;h=5daf750d1942f3b97844b4ef378daf9346cb46d4;hb=0d8fc3efc65df74a2b39b3f9798861a1b2055b62;hp=d1a17e2625890245341a2099cc2b058e63564da2;hpb=bb11eb31a2e7da7f878dd501d39f6877ec00eb7d;p=git.git

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index d1a17e262..5daf750d1 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -30,6 +30,17 @@ submodule.<name>.path::
 submodule.<name>.url::
 	Defines an url from where the submodule repository can be cloned.
 
+submodule.<name>.update::
+	Defines what to do when the submodule is updated by the superproject.
+	If 'checkout' (the default), the new commit specified in the
+	superproject will be checked out in the submodule on a detached HEAD.
+	If 'rebase', the current branch of the submodule will be rebased onto
+	the commit specified in the superproject. If 'merge', the commit
+	specified in the superproject will be merged into the current branch
+	in the submodule.
+	This config option is overridden if 'git submodule update' is given
+	the '--merge' or '--rebase' options.
+
 
 EXAMPLES
 --------