Re: git: avoiding merges, rebasing

From: Benoit SIGOURE <tsuna@lrde.epita.fr>
Date: Oct 9, 2007, 18:06 UTC
Message-ID: <AAC50815-7438-4934-81EC-02EE08B38854@lrde.epita.fr>
In-Reply-To: <Pine.LNX.4.64.0710091141440.4174@racer.site>

On Oct 9, 2007, at 12:43 PM, Johannes Schindelin wrote:

Show 10 quoted lines

> Hi,
>
> On Mon, 8 Oct 2007, Benoit SIGOURE wrote:
>
>> [as usual, I forgot the attachment...]
>
> Two comments:
>
> - by not inlining you made it hard to review your script.  Therefore I
>   will not do it.

:|

Show 8 quoted lines

>
> - Try to avoid naming the script git-merge-*; these scripts/ 
> programs are
>   merge _strategies_, not merge _drivers_ (and yes, we already have  
> two
>   programs violating this rule -- merge-base and merge-file -- but  
> that
>   does not mean that you are free to add to the pile).

I'm open to better suggestions.

Cheers,

-- 
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory