"Paolo Ciarrocchi" <paolo.ciarrocchi@xxxxxxxxx> writes: > "A merge is always between the current HEAD and one or more remote > branch heads" I think this is just wrong. Would this be correct? diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 0c9ad7f..e46dea1 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -68,7 +68,7 @@ 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 +branch heads (remote or local), 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. -- Matthieu -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
