Re: how do you "force a pull"?

[merlyn@stonehenge.com (Randal L. Schwartz)]

>>>>> "Jing" == Jing Xue <jingxue@digizenstudio.com> writes:

Jing> Ah, this is what I was looking for. Not very intuitive, but works like a
Jing> charm!

I find the word "intuitive" is like "common sense", which apparently isn't
very common. :)

"Not very intuitive" can be translated as "I don't yet share the mental model
from which this observation would be obvious".

I would suggest that to make such observations more intuitive, you stop
thinking of git as you would SVN or (gasp!) CVS, and start paying attention to
what git-fetch is really doing to the local object tree, and git-merge on top
of that, collectively known as git-pull.

The concept of keeping track of a directed graph of commits is not present in
"classic" source code managers... and once you make the mental leap, you'll
wonder why it was ever done differently.  It's revolutionary, not just
evolutionary.

(And if this sounds meta, it's because I'm rewriting my "intro to git" slides
because I just confirmed where my next presentation will be, and want them to
be even better.)

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!