On Mon, Mar 3, 2008 at 4:21 PM, Matthieu Moy <Matthieu.Moy@xxxxxxx> wrote: > "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? Sounds better than the original document, however I'm still having some problems in visualizing what happens when I type "git fetch" followed by "git merge". > 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 When I run the command git fetch the objects are downloaded from the remote branch and locally stored in the objects database. Both the working tree and index are not touched by this operation. Is this correct? How can I look to what I just downloaded? Should I simply do a git diff? Backing to the documentation, your proposal is: A merge is always between the current `HEAD` and one or more branch heads (remote or local), and the index file must exactly match the In case of a git fetch + git merge the merge is between the current `HEAD` and the downloaded objects. Is correct to define it `branch heads`? Maybe (read it: for sure) I'm a bit confused by the git terminology but I really feel that other newbies are not easily understanding this process. Thanks. ciao, -- Paolo http://paolo.ciarrocchi.googlepages.com/ -- 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
