diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:14 -0800 |
| commit | d4e528ef6a00b2176e69e426be0da19c86577ffc (patch) | |
| tree | 0b1fe84e64782e9f038bee9324bf4308a4a8933a | |
| parent | 2409e1035c6c81416f97bc8997ff1bd8cfb94f98 (diff) | |
| parent | 30221a3389f4172940b774829c95927fe6a728e5 (diff) | |
| download | git-d4e528ef6a00b2176e69e426be0da19c86577ffc.tar.gz | |
Merge branch 'as/read-tree-prefix-doc-fix' into maint
Doc update.
* as/read-tree-prefix-doc-fix:
doc/read-tree: remove obsolete remark
| -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 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 |