Re: [PATCH] rebase -i: Teach "--edit" action

From: Johannes Sixt <j6t@kdbg.org>
Date: Sep 10, 2012, 18:36 UTC
Message-ID: <504E333B.2010602@kdbg.org>
In-Reply-To: <20120910165457.GB14201@sigill.intra.peff.net>

Am 10.09.2012 18:54, schrieb Jeff King:

Show 11 quoted lines

> On Mon, Sep 10, 2012 at 12:46:45PM -0400, Andrew Wong wrote:
> 
>>> Just "edit" may be a bit misleading, as we already have the "edit"
>>> action inside the todolist. I'd call this --edit-list to avoid
>>> ambiguity.
>>
>> I thought that might be a bit confusing too. "--edit-list" doesn't
>> seem informative about what "list" we're editing though. What about
>> "--edit-todo"? Any suggestions are welcomed.
> 
> Does it ever make sense to edit and then _not_ immediately continue?

Yes. For example, while you are resolving a conflict, you might notice that it would make sense to do something different in the remaining rebase sequence. You don't want to continue if some conflicts remain. And you don't want to wait editing the todo list until you are done with the conflicts because you might have forgotten that you wanted to do something different.

> You can't affect the current commit anyway (it has already been pulled
> from the todo list), so the next thing you'd want to do it actually act
> on whatever you put into the todo list[1].

Oh, you said it here:

> [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. ;)

-- Hannes