Merge branch 'db/learn-HEAD'

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

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 1521a9ee0fec3a825bdbade4869012b7c3cf3bf7..c136b1069230af55b62ba95a1b40bdcc019b7b42 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -42,7 +42,7 @@ 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
 
 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].
+linkgit:git-reset[1].

 
 CONFIGURATION
 -------------
 
 CONFIGURATION
 -------------


@@ -68,20 +68,21 @@ HOW MERGE WORKS
 ---------------
 
 A merge is always between the current `HEAD` and one or more
 ---------------
 
 A merge is always between the current `HEAD` and one or more

-remote branch heads, and the index file must exactly match the
+commits (usually, branch head or tag), and the index file must
+exactly match the

 tree of `HEAD` commit (i.e. the contents of the last commit) when
 it happens.  In other words, `git-diff --cached HEAD` must
 report no changes.
 
 [NOTE]
 tree of `HEAD` commit (i.e. the contents of the last commit) when
 it happens.  In other words, `git-diff --cached HEAD` must
 report no changes.
 
 [NOTE]

-This is a bit of lie.  In certain special cases, your index are
-allowed to be different from the tree of `HEAD` commit.  The most
+This is a bit of a lie.  In certain special cases, your index is
+allowed to be different from the tree of the `HEAD` commit.  The most

 notable case is when your `HEAD` commit is already ahead of what
 is being merged, in which case your index can have arbitrary
 notable case is when your `HEAD` commit is already ahead of what
 is being merged, in which case your index can have arbitrary

-difference from your `HEAD` commit.  Otherwise, your index entries
-are allowed have differences from your `HEAD` commit that match
-the result of trivial merge (e.g. you received the same patch
-from external source to produce the same result as what you are
+differences from your `HEAD` commit.  Also, your index entries
+may have differences from your `HEAD` commit that match
+the result of a trivial merge (e.g. you received the same patch
+from an external source to produce the same result as what you are

 merging).  For example, if a path did not exist in the common
 ancestor and your head commit but exists in the tree you are
 merging into your repository, and if you already happen to have
 merging).  For example, if a path did not exist in the common
 ancestor and your head commit but exists in the tree you are
 merging into your repository, and if you already happen to have


@@ -163,8 +164,8 @@ After seeing a conflict, you can do two things:
 
 SEE ALSO
 --------
 
 SEE ALSO
 --------

-gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1],
-gitlink:gitattributes[5]
+linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],
+linkgit:gitattributes[5]

 
 
 Author
 
 
 Author


@@ -178,4 +179,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
 
 GIT
 ---

-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite