Skip to content

Commit

Permalink
documentation: clarify read-tree --reset
Browse files Browse the repository at this point in the history
[jc: light edit applied on top of the original]

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
No name authored and Junio C Hamano committed Dec 2, 2005
1 parent 3ace1fe commit 3f41f5a
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Documentation/git-read-tree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.

Expand Down

0 comments on commit 3f41f5a

Please sign in to comment.