diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-23 21:16:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 21:16:41 (GMT) |
| commit | 3e25b6c66b08485d23a79881efb0ba24b73e81f1 (patch) | |
| tree | e711dce582dc2722fd04c9349cfe88301fb5d6fb /Documentation/git-read-tree.txt | |
| parent | 537e1064223181f5811649497c12b98b8319c0d2 (diff) | |
| parent | 30221a3389f4172940b774829c95927fe6a728e5 (diff) | |
| download | git-3e25b6c66b08485d23a79881efb0ba24b73e81f1.zip git-3e25b6c66b08485d23a79881efb0ba24b73e81f1.tar.gz git-3e25b6c66b08485d23a79881efb0ba24b73e81f1.tar.bz2 | |
Merge branch 'as/read-tree-prefix-doc-fix'
Doc update.
* as/read-tree-prefix-doc-fix:
doc/read-tree: remove obsolete remark
Diffstat (limited to 'Documentation/git-read-tree.txt')
| -rw-r--r-- | Documentation/git-read-tree.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 72bd809..f2a07d5 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 |