summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-02 09:11:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-02 09:11:05 (GMT)
commitafaa8d66ab542de0c3f6d00aaacdf0ecfa78ff33 (patch)
treec733a837ad315b926f8645371305f2ef1e14224b /Documentation/git-read-tree.txt
parent8273c79ae2e6b782dba3dccb815b386cc83e4294 (diff)
downloadgit-afaa8d66ab542de0c3f6d00aaacdf0ecfa78ff33.zip
git-afaa8d66ab542de0c3f6d00aaacdf0ecfa78ff33.tar.gz
git-afaa8d66ab542de0c3f6d00aaacdf0ecfa78ff33.tar.bz2
Documentation: read-tree --aggressive
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-read-tree.txt')
-rw-r--r--Documentation/git-read-tree.txt15
1 files changed, 14 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 6fbd6d9..844cfda 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -8,7 +8,7 @@ git-read-tree - Reads tree information into the index
SYNOPSIS
--------
-'git-read-tree' (<tree-ish> | [[-m | --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
+'git-read-tree' (<tree-ish> | [[-m [--aggressive]| --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
DESCRIPTION
@@ -50,6 +50,19 @@ OPTIONS
trees that are not directly related to the current
working tree status into a temporary index file.
+--aggressive::
+ Usually a three-way merge by `git-read-tree` 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:
++
+* when one side removes a path and the other side leaves the path
+ unmodified. The resolution is to remove that path.
+* when both sides remove a path. The resolution is to remove that path.
+* when both sides adds a path identically. The resolution
+ is to add that path.
+
<tree-ish#>::
The id of the tree object(s) to be read/merged.