summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorNo name <linux@horizon.com>2005-12-02 11:37:13 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-02 20:20:34 (GMT)
commit3f41f5a9fefafabb561db4ce9c9b4e0944ec1f85 (patch)
tree323db6876ebe5054ef50b5b1abe5db5fdc018716 /Documentation/git-read-tree.txt
parent3ace1fe34bbf24a62215d06614f9cf29a80def4a (diff)
downloadgit-3f41f5a9fefafabb561db4ce9c9b4e0944ec1f85.zip
git-3f41f5a9fefafabb561db4ce9c9b4e0944ec1f85.tar.gz
git-3f41f5a9fefafabb561db4ce9c9b4e0944ec1f85.tar.bz2
documentation: clarify read-tree --reset
[jc: light edit applied on top of the original] Signed-off-by: Junio C Hamano <junkio@cox.net>
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.