diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-06 10:39:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-06 10:39:07 -0800 |
| commit | 932f7e47699993de0f6ad2af92be613994e40afe (patch) | |
| tree | 1cc024398509d869352d4745acce18995da3a629 /Documentation | |
| parent | Merge branch 'maint' (diff) | |
| parent | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint (diff) | |
| download | tgif-932f7e47699993de0f6ad2af92be613994e40afe.tar.xz | |
Merge branch 'maint'
* maint:
Documentation/gitmodules: Only 'update' and 'url' are required
l10n: de.po: fix translation of 'prefix'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitmodules.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index f7be93f631..347a9f76ee 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -35,6 +35,8 @@ submodule.<name>.url:: linkgit:git-clone[1] or (if it begins with ./ or ../) a location relative to the superproject's origin repository. +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 |