[PATCH] Documentation: read-tree --prefix works with existing subtrees
- From
Clemens Buchacher <drizzd@aon.at>
- Date
- Dec 31, 2011, 11:50 UTC
- Message-ID
- <20111231115056.GA11628@ecki.lan>
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> --- Documentation/git-read-tree.txt | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 5375549..a43e874 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
-- 1.7.8