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

2012-09-10 Thread Andrew Wong
On Mon, Sep 10, 2012 at 3:57 PM, Junio C Hamano wrote: > Hrm... They see the contents of the todo file immediately after > they say "rebase --edit-todo" and the sole reason they said that > command is because they wanted to edit the todo file. Is it likely > they need a reminder? Yes, it's not

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

2012-09-10 Thread Junio C Hamano
Andrew Wong writes: > On Mon, Sep 10, 2012 at 2:46 PM, Jeff King 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. >

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

2012-09-10 Thread Andrew Wong
On Mon, Sep 10, 2012 at 2:46 PM, Jeff King 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

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

2012-09-10 Thread Jeff King
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 > > care

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

2012-09-10 Thread Johannes Sixt
Am 10.09.2012 18:54, schrieb Jeff King: > 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 conf

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

2012-09-10 Thread Jeff King
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 infor

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

2012-09-10 Thread Andrew Wong
On Mon, Sep 10, 2012 at 12:25 PM, Matthieu Moy wrote: > Indent with space. Please, use tabs (same below). Ah, thanks. Good catch. > 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 mig

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

2012-09-10 Thread Matthieu Moy
Andrew Wong writes: > This allows users to edit the todo list while they're in the middle of > an interactive rebase. I like the idea. > +edit) > + git_sequence_editor "$todo" || > +die_abort "Could not execute editor" > + > + exit > + ;; Indent with space. Please, use tabs (same below)