Browse Source

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

Doc update.

* as/read-tree-prefix-doc-fix:
  doc/read-tree: remove obsolete remark
maint
Junio C Hamano 7 years ago
parent
commit
d4e528ef6a
  1. 5
      Documentation/git-read-tree.txt

5
Documentation/git-read-tree.txt

@ -81,12 +81,11 @@ OPTIONS @@ -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

Loading…
Cancel
Save