summaryrefslogtreecommitdiffstats
path: root/git-read-tree.html
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.html
parent613e7c2b6be68147a3a683ac3ff41cc394b18c10 (diff)
downloadgit-htmldocs-7b9cce9df833532347e272c1a4ad6b17f6564f7f.tar.gz
Autogenerated HTML docs for v2.16.1-72-g5be1f
Diffstat (limited to 'git-read-tree.html')
-rw-r--r--git-read-tree.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/git-read-tree.html b/git-read-tree.html
index 93345a707..9c1850ac3 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -880,15 +880,14 @@ when both sides add a path identically. The resolution
</ul></div>
</dd>
<dt class="hdlist1">
---prefix=&lt;prefix&gt;/
+--prefix=&lt;prefix&gt;
</dt>
<dd>
<p>
Keep the current index contents, and read the contents
of the named tree-ish under the directory at <code>&lt;prefix&gt;</code>.
The command will refuse to overwrite entries that already
- existed in the original index file. Note that the <code>&lt;prefix&gt;/</code>
- value must end with a slash.
+ existed in the original index file.
</p>
</dd>
<dt class="hdlist1">
@@ -1293,7 +1292,7 @@ support.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-09-27 23:34:18 PDT
+Last updated 2018-01-23 14:34:02 PST
</div>
</div>
</body>