From: Clemens Buchacher <drizzd@aon.at>
Date: Sat, 31 Dec 2011 11:50:56 +0000 (+0100)
Subject: Documentation: read-tree --prefix works with existing subtrees
X-Git-Tag: v1.7.8.3~2^2~1^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c951ef47bf2e34dbde58bda88d430937657d2aa;p=git.git

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 <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 537554982..a43e87448 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -83,11 +83,10 @@ OPTIONS
 
 --prefix=<prefix>/::
 	Keep the current index contents, and read the contents
-	of the named tree-ish under the directory at `<prefix>`. The
-	original index file cannot have anything at the path
-	`<prefix>` itself, nor anything in the `<prefix>/`
-	directory.  Note that the `<prefix>/` value must end
-	with a slash.
+	of the named tree-ish under the directory at `<prefix>`.
+	The command will refuse to overwrite entries that already
+	existed in the original index file. Note that the `<prefix>/`
+	value must end with a slash.
 
 --exclude-per-directory=<gitignore>::
 	When running the command with `-u` and `-m` options, the