@matheusbsbs / matheus-bagliano / commits / 6da0878302
Fork 0

Document git read-tree --trivial

Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jakub Narebski committed Jun 16, 2007 at 21:03 UTC 6da08783022ab7e54fcf63c55ea7a52bd3900b99
2 files changed +8 -2
Documentation/git-read-tree.txt
+7 -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 [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
11 +'git-read-tree' (<tree-ish> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
12
13
14 DESCRIPTION
@@ -50,6 +50,12 @@ OPTIONS
50 trees that are not directly related to the current
51 working tree status into a temporary index file.
52
53 +--trivial::
54 + Restrict three-way merge by `git-read-tree` to happen
55 + only if there is no file-level merging required, instead
56 + of resolving merge for trivial cases and leaving
57 + conflicting files unresolved in the index.
58 +
59 --aggressive::
60 Usually a three-way merge by `git-read-tree` resolves
61 the merge for really trivial cases and leaves other
builtin-read-tree.c
+1 -1
@@ -84,7 +84,7 @@ static void prime_cache_tree(void)
84
85 }
86
87 -static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <sha1> [<sha2> [<sha3>]])";
87 +static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <sha1> [<sha2> [<sha3>]])";
88
89 static struct lock_file lock_file;
90