Skip to content

Commit d4e528e

Browse files
committed
Merge branch 'as/read-tree-prefix-doc-fix' into maint
Doc update. * as/read-tree-prefix-doc-fix: doc/read-tree: remove obsolete remark
2 parents 2409e10 + 30221a3 commit d4e528e

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Documentation/git-read-tree.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,11 @@ OPTIONS
8181
* when both sides add a path identically. The resolution
8282
is to add that path.
8383

84-
--prefix=<prefix>/::
84+
--prefix=<prefix>::
8585
Keep the current index contents, and read the contents
8686
of the named tree-ish under the directory at `<prefix>`.
8787
The command will refuse to overwrite entries that already
88-
existed in the original index file. Note that the `<prefix>/`
89-
value must end with a slash.
88+
existed in the original index file.
9089

9190
--exclude-per-directory=<gitignore>::
9291
When running the command with `-u` and `-m` options, the

0 commit comments

Comments
 (0)