summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Andreas G. Schacker <andreas.schacker@gmail.com>2018-01-09 16:30:34 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-09 11:37:09 -0800
commit30221a3389f4172940b774829c95927fe6a728e5 (patch)
tree6d14c4b2c618f65db4c7733765103df52b5875e9
parentGit 2.10.5 (diff)
downloadtgif-30221a3389f4172940b774829c95927fe6a728e5.tar.xz
doc/read-tree: remove obsolete remark
Earlier versions of `git read-tree` required the `--prefix` option value to end with a slash. This restriction was eventually lifted without a corresponding amendment to the documentation. Signed-off-by: Andreas G. Schacker <andreas.schacker@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-read-tree.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index fa1d557e5b..a34190bb88 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