From ad8c64311bf4a8570e78933144a283f7b62dc984 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 18 Jun 2006 09:26:43 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.0-gcb11 --- git-read-tree.html | 17 +++++++++++++++-- git-read-tree.txt | 11 ++++++++++- git-write-tree.html | 16 +++++++++++++--- git-write-tree.txt | 8 +++++++- 4 files changed, 45 insertions(+), 7 deletions(-) diff --git a/git-read-tree.html b/git-read-tree.html index 5edf6e345..6b7ed417c 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -272,7 +272,7 @@ git-read-tree(1) Manual Page

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

@@ -364,6 +364,19 @@ when both sides adds a path identically. The resolution
+--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#>
@@ -649,7 +662,7 @@ have finished your work-in-progress), attempt the merge again.

diff --git a/git-read-tree.txt b/git-read-tree.txt index d894f537b..11bd9c0ad 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt @@ -8,7 +8,7 @@ git-read-tree - Reads tree information into the index SYNOPSIS -------- -'git-read-tree' ( | [[-m [--aggressive]| --reset] [-u | -i]] [ []]) +'git-read-tree' ( | [[-m [--aggressive] | --reset | --prefix=] [-u | -i]] [ []]) DESCRIPTION @@ -63,6 +63,15 @@ OPTIONS * when both sides adds a path identically. The resolution is to add that path. +--prefix=/:: + Keep the current index contents, and read the contents + of named tree-ish under directory at ``. The + original index file cannot have anything at the path + `` itself, and have nothing in `/` + directory. Note that the `/` value must end + with a slash. + + :: The id of the tree object(s) to be read/merged. diff --git a/git-write-tree.html b/git-write-tree.html index 5b188c959..440b51ca4 100644 --- a/git-write-tree.html +++ b/git-write-tree.html @@ -3,7 +3,7 @@ - +