diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-07-22 14:24:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-22 14:24:35 -0700 |
| commit | c56dce3b811400e73e7b68464cf229aa0edb9d8f (patch) | |
| tree | da27f15acf73ca6f932c32d2e71a40e73c853e30 /Documentation/git-submodule.txt | |
| parent | ed16d0dbf11128e1f92b39a373a83442fa6d5051 (diff) | |
| parent | f22a17e8da25a043950a13f11035930922bb86e7 (diff) | |
| download | git-c56dce3b811400e73e7b68464cf229aa0edb9d8f.tar.gz git-c56dce3b811400e73e7b68464cf229aa0edb9d8f.tar.xz | |
Merge branch 'jl/submodule-add-relurl-wo-upstream'
* jl/submodule-add-relurl-wo-upstream:
submodule add: clean up duplicated code
submodule add: allow relative repository path even when no url is set
submodule add: test failure when url is not configured in superproject
Conflicts:
git-submodule.sh
Diffstat (limited to 'Documentation/git-submodule.txt')
| -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 acb9002fe..0ec85742d 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -78,7 +78,9 @@ to exist in the superproject. If <path> is not given, the <repository> is the URL of the new submodule's origin repository. This may be either an absolute URL, or (if it begins with ./ or ../), the location relative to the superproject's origin -repository. +repository. If the superproject doesn't have an origin configured +the superproject is its own authoritative upstream and the current +working directory is used instead. + <path> is the relative location for the cloned submodule to exist in the superproject. If <path> does not exist, then the |