From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 17 Nov 2006 16:49:46 GMT
Subject: Re: Cleaning up git user-interface warts
Message-ID: <87y7qahvbp.fsf@wine.dyndns.org>
In-Reply-To: <ejkdhv$vog$2@sea.gmane.org>

Jakub Narebski <jnareb@gmail.com> writes:

> 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)?

That sounds very interesting. Has it ever been implemented, or only
discussed?

-- 
Alexandre Julliard