X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-read-tree.html;h=d159a4cc8d18b947be45217302d68a35fb95466f;hb=f0a85daaf3d624dcf841cad8d5d243e6da55ea70;hp=a5bd09f39ddf0fcfa01ce63ca301aa21844e181e;hpb=1a4e841b439ba014b365999c3a6b9e2be3740bd8;p=git.git

diff --git a/git-read-tree.html b/git-read-tree.html
index a5bd09f3..d159a4cc 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -272,7 +272,7 @@ git-read-tree(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-read-tree</em> (&lt;tree-ish&gt; | [[-m | --reset] [-u | -i]] &lt;tree-ish1&gt; [&lt;tree-ish2&gt; [&lt;tree-ish3&gt;]])</p>
+<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>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -333,6 +333,37 @@ will be in unmerged state when <tt>git-read-tree</tt> returns.</p>
 </p>
 </dd>
 <dt>
+--aggressive
+</dt>
+<dd>
+<p>
+        Usually a three-way merge by <tt>git-read-tree</tt> resolves
+        the merge for really trivial cases and leaves other
+        cases unresolved in the index, so that Porcelains can
+        implement different merge policies.  This flag makes the
+        command to resolve a few more cases internally:
+</p>
+<ul>
+<li>
+<p>
+when one side removes a path and the other side leaves the path
+  unmodified.  The resolution is to remove that path.
+</p>
+</li>
+<li>
+<p>
+when both sides remove a path.  The resolution is to remove that path.
+</p>
+</li>
+<li>
+<p>
+when both sides adds a path identically.  The resolution
+  is to add that path.
+</p>
+</li>
+</ul>
+</dd>
+<dt>
 &lt;tree-ish#&gt;
 </dt>
 <dd>
@@ -489,7 +520,7 @@ stage 1 and stage 3 are the same and stage 2 is different take
 <p>The <tt>git-write-tree</tt> command refuses to write a nonsensical tree, and it
 will complain about unmerged entries if it sees a single entry that is not
 stage 0.</p>
-<p>Ok, this all sounds like a collection of totally nonsensical rules,
+<p>OK, this all sounds like a collection of totally nonsensical rules,
 but it's actually exactly what you want in order to do a fast
 merge. The different stages represent the "result tree" (stage 0, aka
 "merged"), the original tree (stage 1, aka "orig"), and the two trees
@@ -517,7 +548,7 @@ a file that has _any_ difference what-so-ever in the three trees
 <p>
 the index file saves and restores with all this information, so you
   can merge things incrementally, but as long as it has entries in
-  stages 1/2/3 (ie "unmerged entries") you can't write the result. So
+  stages 1/2/3 (i.e., "unmerged entries") you can't write the result. So
   now the merge algorithm ends up being really simple:
 </p>
 <ul>
@@ -618,7 +649,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Dec-2005 00:16:31 PDT
+Last updated 04-Jun-2006 07:24:29 UTC
 </div>
 </div>
 </body>
