Made the fixes as suggested by Martin. Martin: Good points. Thanks! Andrew Wong (3): rebase -i: Refactor help messages for todo file rebase -i: Teach "--edit-todo" action rebase -i: Add tests for "--edit-todo" Martin von Zweigbergk (1): rebase usage: subcommands can not be combined with -i Documentation/git-rebase.txt | 5 ++++- git-rebase--interactive.sh | 48 +++++++++++++++++++++++++++++++++---------- git-rebase.sh | 13 ++++++++++-- t/t3404-rebase-interactive.sh | 18 ++++++++++++++++ 4 files changed, 70 insertions(+), 14 deletions(-) -- 1.7.12.318.g79683ba.dirty -- 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