On Mon, Sep 10, 2012 at 12:25 PM, Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> 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 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. > This lacks tests, IMHO, as there are many corner-cases (e.g. should we > be allowed to --edit-list while the worktree is in conflict?) that would > deserve to be at least discussed, and as much as possible automatically > tested. It does seem risky to do, since we're exposing something that used to be internal to "rebase -i". Though I don't see harm in allowing modifications even when there's a conflict, since we're not really committing anything, modifying index, or any worktree file. As long as the todo file exists, and we're stopped in the middle of a rebase, I think editing it shouldn't cause any problems. -- 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