On Mon, Mar 3, 2008 at 2:14 PM, Matthieu Moy <Matthieu.Moy@xxxxxxx> wrote: > "Paolo Ciarrocchi" <paolo.ciarrocchi@xxxxxxxxx> writes: > > > What is still not clear to me is where git is storing > > the objects downloaded during a git fetch operation. > > git fetch downloads the objects to the object database, i.e. > .git/objects/, usualy as a pack. Ok, thanks. > Now, just "having" the objects locally doesn't change much, an object > starts being really interesting if you have a reference (typically, a > branch) pointing to it. "git fetch" will update the remote references > (for example, origin/master), but won't touch the working tree, and > won't do any merge, fast-forward or not, to a local branch. So, most > likely, "git fetch" will be followed by either a merge or a rebase. Yes, your explanation perfectly match my understanding. I was, and I'm still, confused by the following sentence in the git merge documentation: "A merge is always between the current HEAD and one or more remote branch heads" If I think to the following scenario: git fetch git diff (to look at what I downloaded via git fetch) gir merge I don't see a merge between the current HEAD and a _remote_ branch. 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
