From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 26 Feb 2007 18:56:55 GMT
Subject: Re: RFC: Patch editing
Message-ID: <20070226185655.GB2108@spearce.org>
In-Reply-To: <Pine.LNX.4.63.0702261949560.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Mon, 26 Feb 2007, Shawn O. Pearce wrote:
> 
> > Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > > Therefore, I wrote this extremely simple script to sort out the order of 
> > > commits, and possibly merging some. The script lets you edit the commit 
> > > list upon start (reordering it, or removing commits), and then works on 
> > > that list. It has three subcommands:
> > 
> > This simple tool rocks.  Thank you!  ;-)
> 
> I am undecided how to continue. Originally, I wanted to add an "--onto 
> <commit>" option, and maybe an "edit" subcommand, but since Junio made me 
> realize that it is more similar to git-rebase than I previously thought, 
> and that they should merge, possibly in the form of a builtin...

Yea - this is a lot like rebase.  I was also thinking that the -m
(merge mode) in rebase probably should be the only option offered.
I don't see why rebase should format-patch|am when we have the
whole commit available and merge-recursive does an excellent job
on tree level merges.

> But in order to merge the two, I have to learn about rebase's syntax first 
> ;-)

Its easier than it looks.  ;-)

-- 
Shawn.