diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:56:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:56:52 -0700 |
| commit | 75c3a5ccdf114b5485e4828db1923bf4a35b19e2 (patch) | |
| tree | e919c376fa68f0ce8b46918b499d8ed8516c048a /Documentation | |
| parent | 8c278abcbe35b23e9f93e99daf2144336fad1849 (diff) | |
| parent | d6970e42a1763b549ccf93558de7f54a78819d7a (diff) | |
| download | git-75c3a5ccdf114b5485e4828db1923bf4a35b19e2.tar.gz git-75c3a5ccdf114b5485e4828db1923bf4a35b19e2.tar.xz | |
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')
| -rw-r--r-- | Documentation/git-read-tree.txt | 11 | ||||
| -rw-r--r-- | Documentation/git-write-tree.txt | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index d894f537b..11bd9c0ad 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. diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt index 77e12cb94..c85fa89c3 100644 --- a/Documentation/git-write-tree.txt +++ b/Documentation/git-write-tree.txt @@ -8,7 +8,7 @@ git-write-tree - Creates a tree object from the current index SYNOPSIS -------- -'git-write-tree' [--missing-ok] +'git-write-tree' [--missing-ok] [--prefix=<prefix>/] DESCRIPTION ----------- @@ -30,6 +30,12 @@ OPTIONS directory exist in the object database. This option disables this check. +--prefix=<prefix>/:: + Writes a tree object that represents a subdirectory + `<prefix>`. This can be used to write the tree object + for a subproject that is in the named subdirectory. + + Author ------ Written by Linus Torvalds <torvalds@osdl.org> |