undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

documentation: clarify read-tree --reset

Browse Source 
[jc: light edit applied on top of the original]

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
No name 2005-12-02 06:37:13 -05:00 committed by Junio C Hamano
parent 3ace1fe34b
commit 3f41f5a9fe
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/git-read-tree.txt
View File

@ -28,11 +28,14 @@ will be in unmerged state when "git-read-tree" returns.
OPTIONS OPTIONS
------- -------
-m:: -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:: --reset::
Same as -m, except that unmerged entries are discarded
Same as -m except that unmerged entries will be silently ignored. instead of failing.
-u:: -u::
After a successful merge, update the files in the work After a successful merge, update the files in the work
@ -47,7 +50,6 @@ OPTIONS
trees that are not directly related to the current trees that are not directly related to the current
working tree status into a temporary index file. working tree status into a temporary index file.
<tree-ish#>:: <tree-ish#>::
The id of the tree object(s) to be read/merged. The id of the tree object(s) to be read/merged.