diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-03-06 15:46:29 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-06 15:46:29 -0800 |
commit | 6bf68cf9901acfb76960c8b0366da1e35ef35f7d (patch) | |
tree | 83eb3637c180582dfe26e2c4f56afad3070d79ae /gitmodules.txt | |
parent | 7f1bc9d8e78bb4cbc0ffa8461bc4171686e22fa2 (diff) | |
download | git-htmldocs-6bf68cf9901acfb76960c8b0366da1e35ef35f7d.tar.gz |
Autogenerated HTML docs for v2.3.2-209-gd67f9
Diffstat (limited to 'gitmodules.txt')
-rw-r--r-- | gitmodules.txt | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gitmodules.txt b/gitmodules.txt index f6c0dfd02..ac70eca32 100644 --- a/gitmodules.txt +++ b/gitmodules.txt @@ -38,18 +38,15 @@ submodule.<name>.url:: In addition, there are a number of optional keys: 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. - If 'none', the submodule with name `$name` will not be updated - by default. - - This config option is overridden if 'git submodule update' is given - the '--merge', '--rebase' or '--checkout' options. + Defines the default update procedure for the named submodule, + i.e. how the submodule is updated by "git submodule update" + command in the superproject. This is only used by `git + submodule init` to initialize the configuration variable of + the same name. Allowed values here are 'checkout', 'rebase', + 'merge' or 'none'. See description of 'update' command in + linkgit:git-submodule[1] for their meaning. Note that the + '!command' form is intentionally ignored here for security + reasons. submodule.<name>.branch:: A remote branch name for tracking updates in the upstream submodule. |