Re: Cleaning up git user-interface warts

From: Jakub Narebski <jnareb@gmail.com>
Date: Nov 15, 2006, 10:09 UTC
Message-ID: <ejeotu$vrj$3@sea.gmane.org>
In-Reply-To: <Pine.LNX.4.64.0611142342160.2591@xanadu.home>

Nicolas Pitre wrote:

Show 18 quoted lines

> On Tue, 14 Nov 2006, Junio C Hamano wrote:
> 
>> Yes.  The current "merge" started its life as Linus's porcelain
>> (we did not have fetch and pull infrastructure back then) but
>> quickly has become just a helper for pull to produce a merge
>> commit.  If anybody thinks its UI is good as a general end-user
>> level command, there is a need for "head examination".
> 
> If you mean "git merge" it sure needs to be brought forward.  It can't 
> be clearer than:
> 
>       git-merge the_other_branch
> 
> or
> 
>       git-merge git://repo.com/time_machine.git
> 
> to instantaneously understand what is going on.

You mean

      git merge git://repo.com/time_machine.git#branch

don't you (perhaps with 'master' as default branch)?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git