On Mon, Sep 10, 2012 at 2:46 PM, Jeff King <peff@xxxxxxxx> wrote:
> 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
Johannes took the words right out of my mouth. Also, "edit and _not_
continue" also gives the user a chance to second guess while editing
the todo.
That got me thinking... Currently, the todo list has this line at the bottome:
# However, if you remove everything, the rebase will be aborted.
We'd probably want to remove that line, since "remove everything" no
longer aborts the rebase. It'll just finish the rebase. It'll be ugly
to sed it out. Maybe one way to do this is to remove all the comments
and append new ones.
It might also be nice to add a note to remind the user that they're
editing a todo file in a stopped rebase state. i.e. not a fresh
interactive rebase
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html