From: Junio C Hamano <junio@hera.kernel.org>
Date: Wed, 19 Mar 2008 09:24:34 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.5.5-rc0-16-g02b0
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e6c92030b7cf40c5f742ba0eca90f6240db8728e;p=git.git

Autogenerated HTML docs for v1.5.5-rc0-16-g02b0
---

diff --git a/git-merge.html b/git-merge.html
index 686ba7a77..90a021233 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -456,6 +456,18 @@ ours
         branches.
 </p>
 </dd>
+<dt>
+subtree
+</dt>
+<dd>
+<p>
+        This is a modified recursive strategy. When merging trees A and
+        B, if B corresponds to a subtree of A, B is first adjusted to
+        match the tree structure of A, instead of reading the trees at
+        the same level. This adjustment is also done to the common
+        ancestor tree.
+</p>
+</dd>
 </dl>
 <p>If you tried a merge which resulted in a complex conflicts and
 would want to start over, you can recover with
@@ -650,7 +662,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Mar-2008 12:05:57 UTC
+Last updated 19-Mar-2008 09:24:07 UTC
 </div>
 </div>
 </body>
diff --git a/git-pull.html b/git-pull.html
index b4954e43f..a915d80d4 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -831,6 +831,18 @@ ours
         branches.
 </p>
 </dd>
+<dt>
+subtree
+</dt>
+<dd>
+<p>
+        This is a modified recursive strategy. When merging trees A and
+        B, if B corresponds to a subtree of A, B is first adjusted to
+        match the tree structure of A, instead of reading the trees at
+        the same level. This adjustment is also done to the common
+        ancestor tree.
+</p>
+</dd>
 </dl>
 </div>
 <h2>DEFAULT BEHAVIOUR</h2>
@@ -993,7 +1005,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 11-Mar-2008 22:49:45 UTC
+Last updated 19-Mar-2008 09:24:07 UTC
 </div>
 </div>
 </body>
diff --git a/git-rebase.html b/git-rebase.html
index df59b6485..4dbb00d21 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -618,6 +618,18 @@ ours
         branches.
 </p>
 </dd>
+<dt>
+subtree
+</dt>
+<dd>
+<p>
+        This is a modified recursive strategy. When merging trees A and
+        B, if B corresponds to a subtree of A, B is first adjusted to
+        match the tree structure of A, instead of reading the trees at
+        the same level. This adjustment is also done to the common
+        ancestor tree.
+</p>
+</dd>
 </dl>
 </div>
 <h2>NOTES</h2>
@@ -831,7 +843,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 11-Mar-2008 22:49:45 UTC
+Last updated 19-Mar-2008 09:24:07 UTC
 </div>
 </div>
 </body>
diff --git a/merge-strategies.txt b/merge-strategies.txt
index 7df0266ba..1276f858a 100644
--- a/merge-strategies.txt
+++ b/merge-strategies.txt
@@ -33,3 +33,10 @@ ours::
 	merge is always the current branch head.  It is meant to
 	be used to supersede old development history of side
 	branches.
+
+subtree::
+	This is a modified recursive strategy. When merging trees A and
+	B, if B corresponds to a subtree of A, B is first adjusted to
+	match the tree structure of A, instead of reading the trees at
+	the same level. This adjustment is also done to the common
+	ancestor tree.