From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 30 Sep 2012 05:28:12 +0000 (-0700)
Subject: Merge branch 'aw/rebase-i-edit-todo'
X-Git-Tag: v1.8.0-rc0~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68a31b7d956e958f1b51e80f6cb91858e416c95d;p=git.git

Merge branch 'aw/rebase-i-edit-todo'

Teach an option to edit the insn sheet to "git rebase -i".

* aw/rebase-i-edit-todo:
  rebase -i: suggest using --edit-todo to fix an unknown instruction
  rebase -i: Add tests for "--edit-todo"
  rebase -i: Teach "--edit-todo" action
  rebase -i: Refactor help messages for todo file
  rebase usage: subcommands can not be combined with -i
---

68a31b7d956e958f1b51e80f6cb91858e416c95d