From: Jeff King <peff@peff.net>
Date: Mon, 10 Sep 2012 18:46:25 GMT
Subject: Re: [PATCH] rebase -i: Teach "--edit" action
Message-ID: <20120910184625.GA32237@sigill.intra.peff.net>
In-Reply-To: <504E333B.2010602@kdbg.org>

On Mon, Sep 10, 2012 at 08:36:43PM +0200, Johannes Sixt wrote:

> > [1] It does preclude using "--edit" to make a note about a later commit
> >     while you are in the middle of resolving a conflict or something.
> >     You'd have to do it at the end. I don't know if anybody actually
> >     cares about that.
> 
> Yes, I do care. At times I tend to have a very short attention span. Or
> it is Windows's slowness that expires my short-term memory more often
> than not. ;)

OK, then I withdraw my proposal. :)

It sounds like it would be safe to do:

  git rebase --edit-todo
  hack hack hack
  git rebase --continue

anyway, so the restriction is not as valuable as it would otherwise have
been.

-Peff