summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-read-tree.txt')
-rw-r--r--Documentation/git-read-tree.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 8b91847..6e92e4a 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -28,11 +28,14 @@ will be in unmerged state when "git-read-tree" returns.
OPTIONS
-------
-m::
- Perform a merge, not just a read.
+ Perform a merge, not just a read. The command will
+ refuse to run if your index file has unmerged entries,
+ indicating that you have not finished previous merge you
+ started.
--reset::
-
- Same as -m except that unmerged entries will be silently ignored.
+ Same as -m, except that unmerged entries are discarded
+ instead of failing.
-u::
After a successful merge, update the files in the work
@@ -47,7 +50,6 @@ OPTIONS
trees that are not directly related to the current
working tree status into a temporary index file.
-
<tree-ish#>::
The id of the tree object(s) to be read/merged.