提交 3f41f5a9 编写于 作者: N No name 提交者: Junio C Hamano

documentation: clarify read-tree --reset

[jc: light edit applied on top of the original]
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 3ace1fe3
......@@ -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.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册