@matheusbsbs / matheus-bagliano / commits / 3f41f5a9fe
Fork 0

documentation: clarify read-tree --reset

[jc: light edit applied on top of the original] Signed-off-by: Junio C Hamano <junkio@cox.net>

No name committed Dec 2, 2005 at 06:37 UTC 3f41f5a9fefafabb561db4ce9c9b4e0944ec1f85
1 file changed +6 -4
Documentation/git-read-tree.txt
+6 -4
@@ -28,11 +28,14 @@ will be in unmerged state when "git-read-tree" returns.
28 OPTIONS
29 -------
30 -m::
31 - Perform a merge, not just a read.
31 + Perform a merge, not just a read. The command will
32 + refuse to run if your index file has unmerged entries,
33 + indicating that you have not finished previous merge you
34 + started.
35
36 --reset::
34 -
35 - Same as -m except that unmerged entries will be silently ignored.
37 + Same as -m, except that unmerged entries are discarded
38 + instead of failing.
39
40 -u::
41 After a successful merge, update the files in the work
@@ -47,7 +50,6 @@ OPTIONS
50 trees that are not directly related to the current
51 working tree status into a temporary index file.
52
50 -
53 <tree-ish#>::
54 The id of the tree object(s) to be read/merged.
55