diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-03 16:22:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-03 16:22:37 -0800 |
| commit | db472bc17bfef8588e1a8f6ce873e5c6f4fa384a (patch) | |
| tree | 2ec72b39a55b4e44bfabb02d164fe298999e8aef /git-read-tree.txt | |
| parent | 962f3a392a5b5c3f552a403dcc58d9f1eae2a930 (diff) | |
| download | git-htmldocs-db472bc17bfef8588e1a8f6ce873e5c6f4fa384a.tar.gz | |
Autogenerated HTML docs for v1.7.8.2-321-g4570a
Diffstat (limited to 'git-read-tree.txt')
| -rw-r--r-- | git-read-tree.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/git-read-tree.txt b/git-read-tree.txt index 537554982..a43e87448 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt @@ -83,11 +83,10 @@ OPTIONS --prefix=<prefix>/:: Keep the current index contents, and read the contents - of the named tree-ish under the directory at `<prefix>`. The - original index file cannot have anything at the path - `<prefix>` itself, nor anything in the `<prefix>/` - directory. Note that the `<prefix>/` value must end - with a slash. + 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. --exclude-per-directory=<gitignore>:: When running the command with `-u` and `-m` options, the |