summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-18 00:56:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-18 00:56:52 (GMT)
commit75c3a5ccdf114b5485e4828db1923bf4a35b19e2 (patch)
treee919c376fa68f0ce8b46918b499d8ed8516c048a /Documentation/git-read-tree.txt
parent8c278abcbe35b23e9f93e99daf2144336fad1849 (diff)
parentd6970e42a1763b549ccf93558de7f54a78819d7a (diff)
downloadgit-75c3a5ccdf114b5485e4828db1923bf4a35b19e2.zip
git-75c3a5ccdf114b5485e4828db1923bf4a35b19e2.tar.gz
git-75c3a5ccdf114b5485e4828db1923bf4a35b19e2.tar.bz2
Merge branch 'jc/rw-prefix'
* jc/rw-prefix: read-tree: reorganize bind_merge code. write-tree: --prefix=<path> read-tree: --prefix=<path>/ option.
Diffstat (limited to 'Documentation/git-read-tree.txt')
-rw-r--r--Documentation/git-read-tree.txt11
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index d894f53..11bd9c0 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -8,7 +8,7 @@ git-read-tree - Reads tree information into the index
SYNOPSIS
--------
-'git-read-tree' (<tree-ish> | [[-m [--aggressive]| --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
+'git-read-tree' (<tree-ish> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
DESCRIPTION
@@ -63,6 +63,15 @@ OPTIONS
* when both sides adds a path identically. The resolution
is to add that path.
+--prefix=<prefix>/::
+ Keep the current index contents, and read the contents
+ of named tree-ish under directory at `<prefix>`. The
+ original index file cannot have anything at the path
+ `<prefix>` itself, and have nothing in `<prefix>/`
+ directory. Note that the `<prefix>/` value must end
+ with a slash.
+
+
<tree-ish#>::
The id of the tree object(s) to be read/merged.