summaryrefslogtreecommitdiffstats
path: root/git-read-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-01-23 14:34:27 -0800
committerJunio C Hamano <gitster@pobox.com>2018-01-23 14:34:27 -0800
commit7b9cce9df833532347e272c1a4ad6b17f6564f7f (patch)
treecae0754028bacaf8511ea4a0d53e4fc54c21e183 /git-read-tree.txt
parent613e7c2b6be68147a3a683ac3ff41cc394b18c10 (diff)
downloadgit-htmldocs-7b9cce9df833532347e272c1a4ad6b17f6564f7f.tar.gz
Autogenerated HTML docs for v2.16.1-72-g5be1f
Diffstat (limited to 'git-read-tree.txt')
-rw-r--r--git-read-tree.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/git-read-tree.txt b/git-read-tree.txt
index 72bd809fb..f2a07d54d 100644
--- a/git-read-tree.txt
+++ b/git-read-tree.txt
@@ -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