From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Feb 2018 23:18:14 +0000 (-0800)
Subject: Merge branch 'as/read-tree-prefix-doc-fix' into maint
X-Git-Tag: v2.16.2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d4e528ef6a00b2176e69e426be0da19c86577ffc?hp=2409e1035c6c81416f97bc8997ff1bd8cfb94f98

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

Doc update.

* as/read-tree-prefix-doc-fix:
doc/read-tree: remove obsolete remark
---

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 72bd809fb8..f2a07d54d6 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/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