[PATCH] Fix incorrect wording in git-merge.txt.

From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Mar 3, 2008, 17:52 UTC
Message-ID: <1204566769-6585-1-git-send-email-Matthieu.Moy@imag.fr>
In-Reply-To: <1204564483-5260-1-git-send-email-Matthieu.Moy@imag.fr>

A merge is not necessarily with a remote branch, it can be with any commit object.

Thanks to Paolo Ciarrocchi for pointing out the problem, and to Nicolas Pitre for pointing out the fact that a merge is not necessarily with a branch head.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
 Documentation/git-merge.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0c9ad7f..193c9c0 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -68,7 +68,8 @@ HOW MERGE WORKS
 ---------------
 
 A merge is always between the current `HEAD` and one or more
-remote branch heads, and the index file must exactly match the
+commit objects (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.

-- 
1.5.4.21.g82c44