X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=c136b1069230af55b62ba95a1b40bdcc019b7b42;hb=6c41b80153a2e4ee347d0e968ee8d0d9abfc8862;hp=0c9ad7f2bbdf4872882d127804e7c474729c0818;hpb=a41acc63badf20cbb22cca61039dca9309deaa19;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0c9ad7f2b..c136b1069 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
+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.