diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-03-19 09:24:34 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-03-19 09:24:34 +0000 |
| commit | e6c92030b7cf40c5f742ba0eca90f6240db8728e (patch) | |
| tree | 9016426a2011fbb87deb51d2ffbede144c202c8d /git-merge.html | |
| parent | 4de61f82f8ff629080374bf74964bccbcb99696e (diff) | |
| download | git-htmldocs-e6c92030b7cf40c5f742ba0eca90f6240db8728e.tar.gz | |
Autogenerated HTML docs for v1.5.5-rc0-16-g02b0
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 14 |
1 files changed, 13 insertions, 1 deletions
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>
|