Document git read-tree --trivial

jnareb · gitster · commit 6da08783022a · 2007-06-16T13:08:09.000-07:00
Signed-off-by: Jakub Narebski &lt;jnareb@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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 [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
+'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>]])
 
 
 DESCRIPTION
@@ -50,6 +50,12 @@ OPTIONS
 	trees that are not directly related to the current
 	working tree status into a temporary index file.
 
+--trivial::
+	Restrict three-way merge by `git-read-tree` to happen
+	only if there is no file-level merging required, instead
+	of resolving merge for trivial cases and leaving
+	conflicting files unresolved in the index.
+
 --aggressive::
 	Usually a three-way merge by `git-read-tree` resolves
 	the merge for really trivial cases and leaves other
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
@@ -84,7 +84,7 @@ static void prime_cache_tree(void)
 
 }
 
-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>]])";
+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>]])";
 
 static struct lock_file lock_file;
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ static void prime_cache_tree(void)`
`84`	`84`
`85`	`85`	`}`
`86`	`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`	`88`
`89`	`89`	`static struct lock_file lock_file;`
`90`	`90`