diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:04:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:04:32 -0700 |
| commit | c255a70b5ef4e70070b6076c4308da9d163d56a9 (patch) | |
| tree | 67126e0dd61c9aad5c48bfd5253e13230b9502d2 /Documentation | |
| parent | Git 1.7.2-rc3 (diff) | |
| parent | Documentation: add submodule.* to the big configuration variable list (diff) | |
| download | tgif-c255a70b5ef4e70070b6076c4308da9d163d56a9.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: add submodule.* to the big configuration variable list
gitmodules.5: url can be a relative path
gitweb: fix esc_url
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 9 | ||||
| -rw-r--r-- | Documentation/gitmodules.txt | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 79d54e546a..e75434b3ef 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1734,6 +1734,15 @@ status.submodulesummary:: summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). +submodule.<name>.path:: +submodule.<name>.url:: +submodule.<name>.update:: + The path within this project, URL, and the updating strategy + for a submodule. These variables are initially populated + by 'git submodule init'; edit them to override the + URL and other values found in the `.gitmodules` file. See + linkgit:git-submodule[1] and linkgit:gitmodules[5] for details. + tar.umask:: This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 5daf750d19..72a13d18e0 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -29,6 +29,9 @@ submodule.<name>.path:: submodule.<name>.url:: Defines an url from where the submodule repository can be cloned. + This may be either an absolute URL ready to be passed to + linkgit:git-clone[1] or (if it begins with ./ or ../) a location + relative to the superproject's origin repository. submodule.<name>.update:: Defines what to do when the submodule is updated by the superproject. |