Merge branch 'aw/rebase-i-p'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2011 21:31:36 +0000 (14:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2011 21:31:36 +0000 (14:31 -0700)
commit23f229d8cd02eb933512637b617be5ea85d4a608
treecf0b2731a3c39ec4155352c75da4e8ec2029ca54
parent551d75dbd80cb6af08376ea8a12bdaa3f5860f35
parent12bf828348922935b1d5ca10f2d829c9a64b6e41
Merge branch 'aw/rebase-i-p'

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