diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:42:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:42:11 -0800 |
| commit | 902f2f4f0a0bcc6c8d63ad4cd6b75b7eb9d65a72 (patch) | |
| tree | d47607e6111ba79292a3e5dcc69603139d7e0623 /Documentation/config.txt | |
| parent | 971e829cd84cf95203cec44d22d0e009f98ddbf5 (diff) | |
| parent | b928922727d6691a3bdc28160f93f25712c565f6 (diff) | |
| download | git-902f2f4f0a0bcc6c8d63ad4cd6b75b7eb9d65a72.tar.gz | |
Merge branch 'wk/submodule-update-remote'
The beginning of 'integrate with the tip of the remote branch, not
the commit recorded in the superproject gitlink' support.
* wk/submodule-update-remote:
submodule add: If --branch is given, record it in .gitmodules
submodule update: add --remote for submodule's upstream changes
submodule: add get_submodule_config helper funtion
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0e206759fd..53c4ca1d7a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2007,6 +2007,12 @@ submodule.<name>.update:: URL and other values found in the `.gitmodules` file. See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details. +submodule.<name>.branch:: + The remote branch name for a submodule, used by `git submodule + update --remote`. Set this option to override the value found in + the `.gitmodules` file. See linkgit:git-submodule[1] and + linkgit:gitmodules[5] for details. + submodule.<name>.fetchRecurseSubmodules:: This option can be used to control recursive fetching of this submodule. It can be overridden by using the --[no-]recurse-submodules |