Fix incorrect wording in git-merge.txt.
A merge is not necessarily with a remote branch, it can be with any commit. 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Mar 3, 2008 at 18:52 UTC
81646ad247955a8343b58f05f12157dacabe1e5e
1 file changed
+2
-1
Documentation/git-merge.txt
+2
-1
@@ -68,7 +68,8 @@ HOW MERGE WORKS
68
---------------
69
70
A merge is always between the current `HEAD` and one or more
71
-remote branch heads, and the index file must exactly match the
71
+commits (usually, branch head or tag), and the index file must
72
+exactly match the
73
tree of `HEAD` commit (i.e. the contents of the last commit) when
74
it happens. In other words, `git-diff --cached HEAD` must
75
report no changes.