From 5c951ef47bf2e34dbde58bda88d430937657d2aa Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Sat, 31 Dec 2011 12:50:56 +0100 Subject: Documentation: read-tree --prefix works with existing subtrees Since 34110cd4 (Make 'unpack_trees()' have a separate source and destination index) it is no longer true that a subdirectory with the same prefix must not exist. Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano --- Documentation/git-read-tree.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 5375549820..a43e87448b 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -83,11 +83,10 @@ OPTIONS --prefix=/:: Keep the current index contents, and read the contents - of the named tree-ish under the directory at ``. The - original index file cannot have anything at the path - `` itself, nor anything in the `/` - directory. Note that the `/` value must end - with a slash. + of the named tree-ish under the directory at ``. + The command will refuse to overwrite entries that already + existed in the original index file. Note that the `/` + value must end with a slash. --exclude-per-directory=:: When running the command with `-u` and `-m` options, the -- cgit v1.2.3 From 9e6ed475e7a8d39350f102f0730d321de08e0585 Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Sun, 1 Jan 2012 16:13:16 +0100 Subject: docs: describe behavior of relative submodule URLs Since the relative submodule URLs have been introduced in f31a522a2d, they do not conform to the rules for resolving relative URIs but rather to those of relative directories. Document that behavior. Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano --- Documentation/git-submodule.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 67cf5f0f8b..cd9c167e0a 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -79,7 +79,12 @@ to exist in the superproject. If is not given, the 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. If the superproject doesn't have an origin configured +repository (Please note that to specify a repository 'foo.git' +which is located right next to a superproject 'bar.git', you'll +have to use '../foo.git' instead of './foo.git' - as one might expect +when following the rules for relative URLs - because the evaluation +of relative URLs in Git is identical to that of relative directories). +If the superproject doesn't have an origin configured the superproject is its own authoritative upstream and the current working directory is used instead. + -- cgit v1.2.3