Re: Cleaning up git user-interface warts

From: Shawn Pearce <spearce@spearce.org>
Date: Nov 15, 2006, 23:02 UTC
Message-ID: <20061115230252.GH24861@spearce.org>
In-Reply-To: <87psbos4pb.wl%cworth@cworth.org>

Carl Worth <cworth@cworth.org> wrote:

Show 8 quoted lines

> Plus, when I'm teaching "fetch everything first, then manipulate it
> locally", (which is what I teach, since that's the only way I use
> git), then the "." looks really out of place when I teach the 'merge'
> command. I end up saying, "Oh, that's there because you could do the
> fetch and merge all in one step if you really wanted, but I never do
> that.".
> 
> And that's because I _do_ teach fetch first, as you've suggested.

Ditto.  In every way.

I've taught the same fetch first, then merge strategy. Nobody I know in meat-space pulls from a remote URL and merges in one shot; they always fetch locally, look at the incoming changes, decide if its worthwhile/ok, *then* merge with "git pull . branch".

The "." looks out of place for everyone...