summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2007-06-16 19:03:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-16 20:08:09 (GMT)
commit6da08783022ab7e54fcf63c55ea7a52bd3900b99 (patch)
tree08488d4d940ddac6c1b1819e733fad79c1af6d90 /Documentation/git-read-tree.txt
parent29a6c3f8046ca2de39958a1e9fa93d4afc9461bf (diff)
downloadgit-6da08783022ab7e54fcf63c55ea7a52bd3900b99.zip
git-6da08783022ab7e54fcf63c55ea7a52bd3900b99.tar.gz
git-6da08783022ab7e54fcf63c55ea7a52bd3900b99.tar.bz2
Document git read-tree --trivial
Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-read-tree.txt')
-rw-r--r--Documentation/git-read-tree.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 84184d6..74c5478 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 [--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