gitweb: fill in gitweb configuration by Makefile

[git.git] / Documentation / git-merge.txt

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0cac563d40f17361569923aebb51e454fd24f92e..bebf30ad3db951c0a0bad01ebee619821781eb39 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -37,6 +37,11 @@ include::merge-options.txt[]
 include::merge-strategies.txt[]
 
 
 include::merge-strategies.txt[]
 
 

+If you tried a merge which resulted in a complex conflicts and
+would want to start over, you can recover with
+gitlink:git-reset[1].
+
+

 HOW MERGE WORKS
 ---------------
 
 HOW MERGE WORKS
 ---------------
 


@@ -78,7 +83,7 @@ your local modifications interfere with the merge, again, it
 stops before touching anything.
 
 So in the above two "failed merge" case, you do not have to
 stops before touching anything.
 
 So in the above two "failed merge" case, you do not have to

-worry about lossage of data --- you simply were not ready to do
+worry about loss of data --- you simply were not ready to do

 a merge, so no merge happened at all.  You may want to finish
 whatever you were in the middle of doing, and retry the same
 pull after you are done and ready.
 a merge, so no merge happened at all.  You may want to finish
 whatever you were in the middle of doing, and retry the same
 pull after you are done and ready.