From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jul 2011 21:31:36 +0000 (-0700)
Subject: Merge branch 'aw/rebase-i-p'
X-Git-Tag: v1.7.7-rc0~102
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23f229d8cd02eb933512637b617be5ea85d4a608;p=git.git

Merge branch 'aw/rebase-i-p'

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

23f229d8cd02eb933512637b617be5ea85d4a608