Documentation: read-tree --aggressive
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Mar 2, 2006 at 01:11 UTC
afaa8d66ab542de0c3f6d00aaacdf0ecfa78ff33
2 files changed
+15
-2
Documentation/git-read-tree.txt
+14
-1
@@ -8,7 +8,7 @@ git-read-tree - Reads tree information into the index
8
9
SYNOPSIS
10
--------
11
-'git-read-tree' (<tree-ish> | [[-m | --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
11
+'git-read-tree' (<tree-ish> | [[-m [--aggressive]| --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
12
13
14
DESCRIPTION
@@ -50,6 +50,19 @@ OPTIONS
50
trees that are not directly related to the current
51
working tree status into a temporary index file.
52
53
+--aggressive::
54
+ Usually a three-way merge by `git-read-tree` resolves
55
+ the merge for really trivial cases and leaves other
56
+ cases unresolved in the index, so that Porcelains can
57
+ implement different merge policies. This flag makes the
58
+ command to resolve a few more cases internally:
59
++
60
+* when one side removes a path and the other side leaves the path
61
+ unmodified. The resolution is to remove that path.
62
+* when both sides remove a path. The resolution is to remove that path.
63
+* when both sides adds a path identically. The resolution
64
+ is to add that path.
65
+
66
<tree-ish#>::
67
The id of the tree object(s) to be read/merged.
68
read-tree.c
+1
-1
@@ -706,7 +706,7 @@ static int read_cache_unmerged(void)
706
return deleted;
707
}
708
709
-static const char read_tree_usage[] = "git-read-tree (<sha> | -m [-u | -i] <sha1> [<sha2> [<sha3>]])";
709
+static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])";
710
711
static struct cache_file cache_file;
712