{"thread":{"id":"29274","subject":"[PATCH] Documentation: read-tree --prefix works with existing subtrees","startedAt":"2011-12-31T11:50:56Z","lastAt":"2011-12-31T11:50:56Z","messageCount":1,"participants":["Clemens Buchacher"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"181813","messageId":"20111231115056.GA11628@ecki.lan","threadId":"29274","inReplyTo":null,"subject":"[PATCH] Documentation: read-tree --prefix works with existing subtrees","fromName":"Clemens Buchacher","fromEmail":"drizzd@aon.at","sentAt":"2011-12-31T11:50:56Z","receivedAt":"2011-12-31T11:50:56Z","isPatch":true,"sender":{"key":"drizzd@gmx.net","avatar":"https://avatars.githubusercontent.com/u/59082?v=4"},"body":"\nSince 34110cd4 (Make 'unpack_trees()' have a separate source and\ndestination index) it is no longer true that a subdirectory with\nthe same prefix must not exist.\n\nSigned-off-by: Clemens Buchacher <drizzd@aon.at>\n---\n Documentation/git-read-tree.txt |    9 ++++-----\n 1 files changed, 4 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt\nindex 5375549..a43e874 100644\n--- a/Documentation/git-read-tree.txt\n+++ b/Documentation/git-read-tree.txt\n@@ -83,11 +83,10 @@ OPTIONS\n \n --prefix=<prefix>/::\n \tKeep the current index contents, and read the contents\n-\tof the named tree-ish under the directory at `<prefix>`. The\n-\toriginal index file cannot have anything at the path\n-\t`<prefix>` itself, nor anything in the `<prefix>/`\n-\tdirectory.  Note that the `<prefix>/` value must end\n-\twith a slash.\n+\tof the named tree-ish under the directory at `<prefix>`.\n+\tThe command will refuse to overwrite entries that already\n+\texisted in the original index file. Note that the `<prefix>/`\n+\tvalue must end with a slash.\n \n --exclude-per-directory=<gitignore>::\n \tWhen running the command with `-u` and `-m` options, the\n-- \n1.7.8\n"}]}