projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3fd90c8)
Autogenerated HTML docs for v1.4.0-gcb11
authorJunio C Hamano <junio@hera.kernel.org>
Sun, 18 Jun 2006 09:26:43 +0000 (09:26 +0000)
committerJunio C Hamano <junio@hera.kernel.org>
Sun, 18 Jun 2006 09:26:43 +0000 (09:26 +0000)
git-read-tree.html patch | blob | history
git-read-tree.txt patch | blob | history
git-write-tree.html patch | blob | history
git-write-tree.txt patch | blob | history

diff --git a/git-read-tree.html b/git-read-tree.html
index 5edf6e3455b001a76f9f8e6d5f4e9959540e1da9..6b7ed417c961b8bd57b0116025ea365d179a83d8 100644 (file)
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -272,7 +272,7 @@ git-read-tree(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-read-tree</em> (&lt;tree-ish&gt; | [[-m [--aggressive]| --reset] [-u | -i]] &lt;tree-ish1&gt; [&lt;tree-ish2&gt; [&lt;tree-ish3&gt;]])</p>\r
+<p><em>git-read-tree</em> (&lt;tree-ish&gt; | [[-m [--aggressive] | --reset | --prefix=&lt;prefix&gt;] [-u | -i]] &lt;tree-ish1&gt; [&lt;tree-ish2&gt; [&lt;tree-ish3&gt;]])</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -364,6 +364,19 @@ when both sides adds a path identically.  The resolution
 </ul>\r
 </dd>\r
 <dt>\r
+--prefix=&lt;prefix&gt;/\r
+</dt>\r
+<dd>\r
+<p>\r
+        Keep the current index contents, and read the contents\r
+        of named tree-ish under directory at <tt>&lt;prefix&gt;</tt>.  The\r
+        original index file cannot have anything at the path\r
+        <tt>&lt;prefix&gt;</tt> itself, and have nothing in <tt>&lt;prefix&gt;/</tt>\r
+        directory.  Note that the <tt>&lt;prefix&gt;/</tt> value must end\r
+        with a slash.\r
+</p>\r
+</dd>\r
+<dt>\r
 &lt;tree-ish#&gt;\r
 </dt>\r
 <dd>\r
@@ -649,7 +662,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jun-2006 19:51:31 UTC\r
+Last updated 18-Jun-2006 09:26:36 UTC\r
 </div>\r
 </div>\r
 </body>\r
diff --git a/git-read-tree.txt b/git-read-tree.txt
index d894f537ba2634ed2719ee746b170a22f0173f56..11bd9c0adc5517ef1aadc76abdb8dfb0827c27b0 100644 (file)
--- 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' (<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/git-write-tree.html b/git-write-tree.html
index 5b188c959c41be6b2b3d16f25b5bf8372772264e..440b51ca4485afa01c4850799f6c1da76a1778d0 100644 (file)
--- a/git-write-tree.html
+++ b/git-write-tree.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
 <head>\r
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
 <style type="text/css">\r
 /* Debug borders */\r
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
@@ -272,7 +272,7 @@ git-write-tree(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-write-tree</em> [--missing-ok]</p>\r
+<p><em>git-write-tree</em> [--missing-ok] [--prefix=&lt;prefix&gt;/]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -297,6 +297,16 @@ now, you need to have done a <tt>git-update-index</tt> phase before you did the
         check.\r
 </p>\r
 </dd>\r
+<dt>\r
+--prefix=&lt;prefix&gt;/\r
+</dt>\r
+<dd>\r
+<p>\r
+        Writes a tree object that represents a subdirectory\r
+        <tt>&lt;prefix&gt;</tt>.  This can be used to write the tree object\r
+        for a subproject that is in the named subdirectory.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>Author</h2>\r
@@ -313,7 +323,7 @@ now, you need to have done a <tt>git-update-index</tt> phase before you did the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:58 PDT\r
+Last updated 18-Jun-2006 09:26:36 UTC\r
 </div>\r
 </div>\r
 </body>\r
diff --git a/git-write-tree.txt b/git-write-tree.txt
index 77e12cb949201445ab33992f9ff155f647ce167c..c85fa89c30e25ed026d2e95a2b537798f878e50f 100644 (file)
--- a/git-write-tree.txt
+++ b/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>
Git—the stupid content tracker