Re: Cleaning up git user-interface warts

From: Nicolas Pitre <nico@cam.org>
Date: Nov 16, 2006, 00:08 UTC
Message-ID: <Pine.LNX.4.64.0611151905460.2591@xanadu.home>
In-Reply-To: <Pine.LNX.4.64.0611151523290.3349@woody.osdl.org>

On Wed, 15 Nov 2006, Linus Torvalds wrote:

Show 20 quoted lines

> 
> 
> On Wed, 15 Nov 2006, Shawn Pearce wrote:
> > 
> > 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;
> 
> Actually, with different people involved it's _much_ better to do it in 
> one shot.
> 
> Why? Because doing a separate "fetch to local space" + "merge from local 
> space" actually loses the information on what you are merging.
> 
> It's a lot more useful to have a merge message like
> 
> 	Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
> 
> than one like
> 
> 	Merge branch 'for-linus'

That is an implementation detail that should be easily overcome once the notion of tracking branch with URL attribute is implemented. Then it will be really easy to notice whether the branch argument is a local branch or a tracking branch with remote reference.