Skip to content

Commit 5c951ef

Browse files
Clemens Buchachergitster
authored andcommitted
Documentation: read-tree --prefix works with existing subtrees
Since 34110cd (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0eddcbf commit 5c951ef

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Documentation/git-read-tree.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,10 @@ OPTIONS
8383

8484
--prefix=<prefix>/::
8585
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.
9190

9291
--exclude-per-directory=<gitignore>::
9392
When running the command with `-u` and `-m` options, the

0 commit comments

Comments
 (0)