From: Brian Gernhardt <benji@silverinsanity.com>
Date: Sun, 24 Jun 2007 03:39:11 GMT
Subject: Re: [PATCH 2/2] Teach rebase an interactive mode
Message-ID: <31A266F6-775E-41AE-B757-BF0DDAC6CAA5@silverinsanity.com>
In-Reply-To: <Pine.LNX.4.64.0706240001150.4059@racer.site>


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.  At first look I thought I would have had  
to type it in.  It took digging into the code to be sure how it  
worked.  You probably want to mention in the documentation that the  
list is generated from the arguments and given in a text editor.

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

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

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

However, those are nits to take a good idea to a great one.  I like  
it very much.

~~ Brian