From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 09 Oct 2007 10:43:29 GMT
Subject: Re: git: avoiding merges, rebasing
Message-ID: <Pine.LNX.4.64.0710091141440.4174@racer.site>
In-Reply-To: <07BCEF3E-90DE-4BB7-8A8C-F03D12293B5F@lrde.epita.fr>

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.

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

Ciao,
Dscho