From: Junio C Hamano Date: Sun, 18 Jun 2006 09:26:48 +0000 (+0000) Subject: Autogenerated man pages for v1.4.0-gcb11 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48f84afd9d946245d03970854f509d06f0a751e7;p=git.git Autogenerated man pages for v1.4.0-gcb11 --- diff --git a/man1/git-read-tree.1 b/man1/git-read-tree.1 index 0fedb5c21..084e28fea 100755 --- a/man1/git-read-tree.1 +++ b/man1/git-read-tree.1 @@ -23,7 +23,7 @@ git-read-tree \- Reads tree information into the index .SH "SYNOPSIS" -\fIgit\-read\-tree\fR ( | [[\-m [\-\-aggressive]| \-\-reset] [\-u | \-i]] [ []]) +\fIgit\-read\-tree\fR ( | [[\-m [\-\-aggressive] | \-\-reset | \-\-prefix=] [\-u | \-i]] [ []]) .SH "DESCRIPTION" @@ -72,6 +72,10 @@ when both sides adds a path identically\&. The resolution is to add that path\&. .RE .IP +.TP +\-\-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\&. + .TP The id of the tree object(s) to be read/merged\&. diff --git a/man1/git-write-tree.1 b/man1/git-write-tree.1 index 2b1aeb973..b99e8fde5 100755 --- a/man1/git-write-tree.1 +++ b/man1/git-write-tree.1 @@ -23,7 +23,7 @@ git-write-tree \- Creates a tree object from the current index .SH "SYNOPSIS" -git\-write\-tree [\-\-missing\-ok] +\fIgit\-write\-tree\fR [\-\-missing\-ok] [\-\-prefix=/] .SH "DESCRIPTION" @@ -42,6 +42,10 @@ Conceptually, git\-write\-tree sync()s the current index contents into a set of \-\-missing\-ok Normally git\-write\-tree ensures that the objects referenced by the directory exist in the object database\&. This option disables this check\&. +.TP +\-\-prefix=/ +Writes a tree object that represents a subdirectory \&. This can be used to write the tree object for a subproject that is in the named subdirectory\&. + .SH "AUTHOR"