Documentation: suggest `reset --merge` in How Merge Works section
The 'merge' manual suggests 'reset' to cancel a merge at the end of the Merge Strategies list. It is more logical to explain this right before explaining how merge conflicts work, so the daunted reader can have a way out when he or she needs it most. While at it, make the advice more dependable and self-contained by providing the --merge option. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Jonathan Nieder committed
Jan 23, 2010 at 03:31 UTC
ed4a6baad0c8d446758eed8827e0d9190e624172
1 file changed
+3
-3
Documentation/git-merge.txt
+3
-3
@@ -45,9 +45,6 @@ include::merge-options.txt[]
45
include::merge-strategies.txt[]
46
47
48
-If you tried a merge which resulted in complex conflicts and
49
-want to start over, you can recover with 'git reset'.
50
-
48
HOW MERGE WORKS
49
---------------
50
@@ -115,6 +112,9 @@ When there are conflicts, the following happens:
112
same and the index entries for them stay as they were,
113
i.e. matching `HEAD`.
114
115
+If you tried a merge which resulted in complex conflicts and
116
+want to start over, you can recover with `git reset --merge`.
117
+
118
HOW CONFLICTS ARE PRESENTED
119
---------------------------
120