mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 18:46:15 +02:00
Code

Merge branch 'as/read-tree-prefix-doc-fix' into maint 

Doc update.

* as/read-tree-prefix-doc-fix:
  doc/read-tree: remove obsolete remark
This commit is contained in:
Junio C Hamano 2018-02-15 15:18:14 -08:00
parent 2409e1035c 30221a3389
commit d4e528ef6a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,12 +81,11 @@ OPTIONS
* when both sides add a path identically. The resolution
is to add that path.
--prefix=<prefix>/::
--prefix=<prefix>::
Keep the current index contents, and read the contents
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.
existed in the original index file.
--exclude-per-directory=<gitignore>::
When running the command with `-u` and `-m` options, the