diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:45:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:45:37 -0700 |
| commit | 0591c0a5be7d58dfe2c69c8a81b2cebbb0337320 (patch) | |
| tree | 78bdfd99a808beaedbdb9bb055e2e693b0dfaa68 /Documentation | |
| parent | 765c7e4f3100484ea277f043048631ea93b3127a (diff) | |
| parent | 2cd9de3e18183422cd7ec3cd81cebc656068ea42 (diff) | |
| download | git-0591c0a5be7d58dfe2c69c8a81b2cebbb0337320.tar.gz | |
Merge branch 'jc/submodule-sync-no-auto-vivify'
* jc/submodule-sync-no-auto-vivify:
submodule add: always initialize .git/config entry
submodule sync: do not auto-vivify uninteresting submodule
Conflicts:
git-submodule.sh
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-submodule.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 12af4de5e1..acb9002fe4 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -167,7 +167,9 @@ commit for each submodule. sync:: Synchronizes submodules' remote URL configuration setting - to the value specified in .gitmodules. This is useful when + to the value specified in .gitmodules. It will only affect those + submodules which already have an url entry in .git/config (that is the + case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly. + |