[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git: avoiding merges, rebasing
From: |
Johannes Schindelin |
Subject: |
Re: git: avoiding merges, rebasing |
Date: |
Tue, 9 Oct 2007 11:43:29 +0100 (BST) |
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
- Re: git: avoiding merges, rebasing, (continued)
- Re: git: avoiding merges, rebasing, Benoit SIGOURE, 2007/10/02
- Re: git: avoiding merges, rebasing, Bruno Haible, 2007/10/02
- Re: git: avoiding merges, rebasing, Eric Blake, 2007/10/02
- stash clear, was Re: git: avoiding merges, rebasing, Johannes Schindelin, 2007/10/19
- Re: stash clear, was Re: git: avoiding merges, rebasing, Miles Bader, 2007/10/23
- Re: git: avoiding merges, rebasing, Benoit SIGOURE, 2007/10/02
- Re: git: avoiding merges, rebasing, Bruno Haible, 2007/10/03
- Re: git: avoiding merges, rebasing, Bruno Haible, 2007/10/03
Re: git: avoiding merges, rebasing, Benoit SIGOURE, 2007/10/08
Re: git: avoiding merges, rebasing, Benoit SIGOURE, 2007/10/08