Merge branch 'aw/rebase-i-p'

* aw/rebase-i-p: rebase -i -p: include non-first-parent commits in todo list

Junio C Hamano committed Jul 13, 2011 at 14:31 UTC 23f229d8cd02eb933512637b617be5ea85d4a608

No changes.