diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-03-02 09:14:51 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-03-02 09:14:51 +0000 |
| commit | 5f32776d3bc48bfda61e2d0586d920bc3baf4b16 (patch) | |
| tree | 40883d389d89cd117b5a3b18894816a07ec285c6 /git-read-tree.html | |
| parent | adb9128b57d85536fbbb7577a0b0035a6ef9b43d (diff) | |
| download | git-htmldocs-5f32776d3bc48bfda61e2d0586d920bc3baf4b16.tar.gz | |
Autogenerated HTML docs for v1.2.4-gec57
Diffstat (limited to 'git-read-tree.html')
| -rw-r--r-- | git-read-tree.html | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/git-read-tree.html b/git-read-tree.html index a5bd09f39..fa551cf2c 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> (<tree-ish> | [[-m | --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])</p>
+<p><em>git-read-tree</em> (<tree-ish> | [[-m [--aggressive]| --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])</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>
<tree-ish#>
</dt>
<dd>
@@ -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 02-Mar-2006 09:14:48 UTC
</div>
</div>
</body>
|