From: Mike Hommey <mh@glandium.org>
Date: Thu, 08 Nov 2007 19:22:31 GMT
Subject: Re: git rebase --skip
Message-ID: <20071108192231.GA22658@glandium.org>
In-Reply-To: <20071108191601.GA22353@glandium.org>

On Thu, Nov 08, 2007 at 08:16:01PM +0100, Mike Hommey wrote:
> On Thu, Nov 08, 2007 at 01:43:05PM -0500, Daniel Barkalow wrote:
> > > git commit
> > > git rebase --skip
> > 
> > I guess that works, and nothing else presently does. But I don't think 
> > that's at all intuitive as the correct thing to do (plus it feels too easy 
> > to get into losing your commit message). Maybe we should have a "git 
> > rebase --amend", which does the obvious thing (acts like --continue, but 
> > lets you edit the message). It's not like you just did something totally 
> > different; the commit is still the replacement for D, it's just less the 
> > same.
> 
> Maybe some commands such as commit should fail or at least emit warning
> when used during a rebase ?

Or, in the present case, doing the same as what "edit" would do in a
git-rebase --interactive could be enough.

Mike