diff options
| author | Clemens Buchacher <drizzd@aon.at> | 2011-12-31 12:50:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-01 01:18:53 -0800 |
| commit | 5c951ef47bf2e34dbde58bda88d430937657d2aa (patch) | |
| tree | 2636588c066f52cb50bdf83a9d2f8e642857e644 | |
| parent | 0eddcbf1612ed044de586777b233caf8016c6e70 (diff) | |
| download | git-5c951ef47bf2e34dbde58bda88d430937657d2aa.tar.gz | |
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>
| -rw-r--r-- | 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 5375549820..a43e87448b 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 |