Re: git annoyances

[Santiago Gala <sgala@apache.org>]

Jeff King <peff <at> peff.net> writes:

(...)
> Unless you are planning on merging this remote a lot, the common usage
> is probably to just forget the remote stuff and do:
> 
>   git pull ~/linux-2.6-x86.git latest
> 

Well, he wants to *merge*, not really to *pull*. A problem I'm encountering a
lot with git is this kind of mismatch between the naming of the command and the
actions. Most of the time the things make sense when they are explained, but
they are not intuitive and I forget them once and again.

I have special problems with "pull" and "fetch". I mean, for me "pull" is about
"pulling code" from other repo, but not really to the working copy, or at least
not always to the working copy.

In fact, the first line of git-pull --help is "Fetch from and merge with another
repository or a local" (pulling together the other two words, fetch and merge,
if you allow the pun). For my very limited git intuition, and I guess for a lot
of people too, pull is just "fetch".