From: Marc Branchaud Date: Mon, 06 Jun 2011 20:49:13 GMT Subject: [PATCH 2/2] Moved paragraph describing the utility of relative submodule URLs. Message-ID: <1307393353-32389-3-git-send-email-marcnarc@xiplink.com> In-Reply-To: <1307393353-32389-1-git-send-email-marcnarc@xiplink.com> Signed-off-by: Marc Branchaud --- Documentation/git-submodule.txt | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 83c59cc..ad67541 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -85,6 +85,14 @@ If the superproject doesn't have an "origin" remote configured the superproject is its own authoritative upstream and the current working directory is used instead. + +In any case, the given URL is recorded into .gitmodules for +use by subsequent users cloning the superproject. If the URL is +given relative to the superproject's repository, the presumption +is the superproject and submodule repositories will be kept +together in the same relative location, and only the +superproject's URL needs to be provided: git-submodule will correctly +locate the submodule using the relative URL in .gitmodules. ++ is the relative location for the cloned submodule to exist in the superproject. If does not exist, then the submodule is created by cloning from the named URL. If does @@ -92,14 +100,6 @@ exist and is already a valid git repository, then this is added to the changeset without cloning. This second form is provided to ease creating a new submodule from scratch, and presumes the user will later push the submodule to the given URL. -+ -In either case, the given URL is recorded into .gitmodules for -use by subsequent users cloning the superproject. If the URL is -given relative to the superproject's repository, the presumption -is the superproject and submodule repositories will be kept -together in the same relative location, and only the -superproject's URL needs to be provided: git-submodule will correctly -locate the submodule using the relative URL in .gitmodules. status:: Show the status of the submodules. This will print the SHA-1 of the -- 1.7.6.rc0.17.g3eac3