diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:13 -0700 |
| commit | f4af7f19639457d71c4e9b53892b937468824cac (patch) | |
| tree | 7da4b356951fc0be359dc145939878e941794c6f /Documentation | |
| parent | 2a764974271aa36101b241fef8e2945db9b418a5 (diff) | |
| parent | f22a17e8da25a043950a13f11035930922bb86e7 (diff) | |
| download | git-f4af7f19639457d71c4e9b53892b937468824cac.tar.gz | |
Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint
* 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')
| -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 2b31d5f1f2..585f03681b 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 |