Skip to content

Commit

Permalink
Documentation: read-tree --prefix works with existing subtrees
Browse files Browse the repository at this point in the history
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 <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Clemens Buchacher authored and Junio C Hamano committed Jan 1, 2012
1 parent 0eddcbf commit 5c951ef
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions Documentation/git-read-tree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5c951ef

Please sign in to comment.