From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 17 Nov 2006 13:32:03 GMT
Subject: Re: Cleaning up git user-interface warts
Message-ID: <ejkdhv$vog$2@sea.gmane.org>
In-Reply-To: <8764dflj5o.fsf@wine.dyndns.org>

Alexandre Julliard wrote:

> Junio C Hamano <junkio@cox.net> writes:
> 
>> I would rather say "use 'git branch' to make sure if you are
>> ready to merge".  Who teaches not to use "git pull"?
> 
> We do that for Wine. The problem is that we recommend using git-rebase
> to make it easier for occasional developers to keep a clean history,
> and rebase and pull interfere badly.

What about proposed (and I think not accepted) merge strategy
"rebase" (formerly called "subordinate" or something like that)?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git