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>
Clemens Buchacher committed
Dec 31, 2011 at 12:50 UTC
5c951ef47bf2e34dbde58bda88d430937657d2aa
1 file changed
+4
-5
Documentation/git-read-tree.txt
+4
-5
@@ -83,11 +83,10 @@ OPTIONS
83
84
--prefix=<prefix>/::
85
Keep the current index contents, and read the contents
86
- of the named tree-ish under the directory at `<prefix>`. The
87
- original index file cannot have anything at the path
88
- `<prefix>` itself, nor anything in the `<prefix>/`
89
- directory. Note that the `<prefix>/` value must end
90
- with a slash.
86
+ of the named tree-ish under the directory at `<prefix>`.
87
+ The command will refuse to overwrite entries that already
88
+ existed in the original index file. Note that the `<prefix>/`
89
+ value must end with a slash.
90
91
--exclude-per-directory=<gitignore>::
92
When running the command with `-u` and `-m` options, the