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

diff --git a/git-merge.html b/git-merge.html
index 686ba7a77bd4af5e69efe6107900d42b7c309e32..90a021233865c4ff4c20cdd642deaefc57f72891 100644 (file)
--- a/git-merge.html
+++ b/git-merge.html
@@ -456,6 +456,18 @@ ours
         branches.\r
 </p>\r
 </dd>\r
+<dt>\r
+subtree\r
+</dt>\r
+<dd>\r
+<p>\r
+        This is a modified recursive strategy. When merging trees A and\r
+        B, if B corresponds to a subtree of A, B is first adjusted to\r
+        match the tree structure of A, instead of reading the trees at\r
+        the same level. This adjustment is also done to the common\r
+        ancestor tree.\r
+</p>\r
+</dd>\r
 </dl>\r
 <p>If you tried a merge which resulted in a complex conflicts and\r
 would want to start over, you can recover with\r
@@ -650,7 +662,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Mar-2008 12:05:57 UTC\r
+Last updated 19-Mar-2008 09:24:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pull.html b/git-pull.html
index b4954e43f8ada2185855c3f9656021a5abc615c2..a915d80d4e8060a6526588869a2734449b3cc090 100644 (file)
--- a/git-pull.html
+++ b/git-pull.html
@@ -831,6 +831,18 @@ ours
         branches.\r
 </p>\r
 </dd>\r
+<dt>\r
+subtree\r
+</dt>\r
+<dd>\r
+<p>\r
+        This is a modified recursive strategy. When merging trees A and\r
+        B, if B corresponds to a subtree of A, B is first adjusted to\r
+        match the tree structure of A, instead of reading the trees at\r
+        the same level. This adjustment is also done to the common\r
+        ancestor tree.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>DEFAULT BEHAVIOUR</h2>\r
@@ -993,7 +1005,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 11-Mar-2008 22:49:45 UTC\r
+Last updated 19-Mar-2008 09:24:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.html b/git-rebase.html
index df59b6485e7cc09718eda05df2728b03d99955c8..4dbb00d21331917818f1ab75ff737791b201fcec 100644 (file)
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -618,6 +618,18 @@ ours
         branches.\r
 </p>\r
 </dd>\r
+<dt>\r
+subtree\r
+</dt>\r
+<dd>\r
+<p>\r
+        This is a modified recursive strategy. When merging trees A and\r
+        B, if B corresponds to a subtree of A, B is first adjusted to\r
+        match the tree structure of A, instead of reading the trees at\r
+        the same level. This adjustment is also done to the common\r
+        ancestor tree.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>NOTES</h2>\r
@@ -831,7 +843,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 11-Mar-2008 22:49:45 UTC\r
+Last updated 19-Mar-2008 09:24:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/merge-strategies.txt b/merge-strategies.txt
index 7df0266ba88b13db52a10b2af6dc620b851b9695..1276f858ade29bec40716d19cf56fe6e3882fc25 100644 (file)
--- 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.