Re: fetch and pull

"John Dlugosz" [off-list ref] writes:

I've gotten the hang of git well enough to pretty much bang on it until
I achieve what I wanted to happen, though maybe trying a few things and
recovering from mistakes or taking the long way around.

Now I'm putting together a cookbook for our team, to allow use of topic
branches rather than treating it simply as a faster SourceSafe.

I want to advocate running

	git fetch

as being a safe thing to do at any time, just to refresh your view of
the origin and not mess up any of your local labels.  That is, you can
see the difference between the local dev and the origin/dev.

So, after inspecting the changes, how do you fast-forward your local dev
to sync up with origin/dev?

$ git push . origin/dev dev