Re: git: avoiding merges, rebasing

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Johannes Schindelin
Date: Tuesday, October 9, 2007 - 3:43 am

Hi,

On Mon, 8 Oct 2007, Benoit SIGOURE wrote:


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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: git: avoiding merges, rebasing, Benoit SIGOURE, (Mon Oct 8, 6:17 am)
Re: git: avoiding merges, rebasing, Johannes Schindelin, (Tue Oct 9, 3:43 am)
Re: git: avoiding merges, rebasing, Bruno Haible, (Tue Oct 9, 5:03 am)
Re: git: avoiding merges, rebasing, Benoit SIGOURE, (Tue Oct 9, 11:06 am)
Re: GNU-style ChangeLog merge driver for Git, Bruno Haible, (Tue Oct 9, 12:38 pm)