From: Nicolas Pitre <nico@cam.org>
Date: Thu, 21 Sep 2006 17:02:12 GMT
Subject: Re: Git user survey and `git pull`
Message-ID: <Pine.LNX.4.64.0609211259340.2627@xanadu.home>
In-Reply-To: <20060921162401.GD3934@spearce.org>

On Thu, 21 Sep 2006, Shawn Pearce wrote:

> I think its probably too late to change the UI[*1*] but I think
> it is definately an issue for folks learning Git.  Calling push
> push, fetch fetch and fetch+merge pull is probably a design flaw.
> IMHO it probably should have been something like:
> 
>   Current            Shoulda Been
>   ---------------    ----------------
>   git-push           git-push
>   git-fetch          git-pull
>   git-pull . foo     git-merge foo
>   git-pull           git-pull --merge
>   git-merge          git-merge-driver
> 
> in other words pull does the download and doesn't automatically
> start a merge unless --merge was also given and git-merge is a
> cleaner wrapper around the Grand Unified Merge Driver that makes
> it easier to start a merge.

I must say that I second this.  Although I'm rather familiar with GIT I 
still feel unconfortable with the current naming and behavior.


Nicolas