Re: [PATCH 2/2] Teach rebase an interactive mode

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jun 24, 2007, 10:12 UTC
Message-ID: <Pine.LNX.4.64.0706241109410.4059@racer.site>
In-Reply-To: <31A266F6-775E-41AE-B757-BF0DDAC6CAA5@silverinsanity.com>

Hi,

On Sat, 23 Jun 2007, Brian Gernhardt wrote:

Show 14 quoted lines

> On Jun 23, 2007, at 7:01 PM, Johannes Schindelin wrote:
> 
> > With "--interactive", git-rebase now lets you edit the list of patches
> > to be reapplied, so that you can reorder and/or delete patches.
> > 
> > Such a list will typically look like this:
> > 
> > 	pick deadbee The oneline of this commit
> > 	pick fa1afe1 The oneline of the next commit
> > 	...
> > 
> 
> It's not at all obvious from your commit message or the documentation 
> where this list comes from.

Oh, okay. I thought that this being just a mode for git-rebase, it would be obvious where that list comes from... Any idea how to state that more clearly?

> Is there a way to say "Oops, that's the wrong list.  Don't do 
> anything."?

It is not at all documented, but yes. Just delete the complete list.

> Perhaps starting the list with a header like the following would make it 
> more user-friendly (Obviously requires s/#.*$//):

All lines with "#" are ignored, yes.

Show 6 quoted lines

> # Rebasing $from..$to onto $commit
> #
> # Commands:
> #  pick = use commit
> #  squash = meld commit into previous
> # <<More useful information here>>

That's a very good idea! (I completely suck at descriptive texts.) Will fix.

Ciao, Dscho