mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-23 07:10:43 +02:00
Code

Documentation: read-tree --prefix works with existing subtrees

Browse Source 
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>
This commit is contained in:
Clemens Buchacher 2011-12-31 12:50:56 +01:00 committed by Junio C Hamano
parent 0eddcbf161
commit 5c951ef47b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/git-read-tree.txt
View File

@ -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