From: Matthieu Moy Date: Mon, 3 Mar 2008 17:52:49 +0000 (+0100) Subject: Fix incorrect wording in git-merge.txt. X-Git-Tag: v1.5.4.4~14 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=81646ad247955a8343b58f05f12157dacabe1e5e;p=git.git 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 Signed-off-by: Junio C Hamano --- 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.