diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-02 01:11:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-02 01:11:05 -0800 |
| commit | afaa8d66ab542de0c3f6d00aaacdf0ecfa78ff33 (patch) | |
| tree | c733a837ad315b926f8645371305f2ef1e14224b | |
| parent | war on whitespaces: documentation. (diff) | |
| download | tgif-afaa8d66ab542de0c3f6d00aaacdf0ecfa78ff33.tar.xz | |
Documentation: read-tree --aggressive
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-read-tree.txt | 15 | ||||
| -rw-r--r-- | read-tree.c | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 6fbd6d9368..844cfda8d2 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. diff --git a/read-tree.c b/read-tree.c index c56b572d05..be29b3fe11 100644 --- a/read-tree.c +++ b/read-tree.c @@ -706,7 +706,7 @@ static int read_cache_unmerged(void) return deleted; } -static const char read_tree_usage[] = "git-read-tree (<sha> | -m [-u | -i] <sha1> [<sha2> [<sha3>]])"; +static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])"; static struct cache_file cache_file; |