From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Aug 2011 18:23:25 +0000 (-0700)
Subject: Merge branch 'aw/rebase-i-p' into maint
X-Git-Tag: v1.7.6.1~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=824f4a93890b06d47d46f87b146022266977b2a9;p=git.git

Merge branch 'aw/rebase-i-p' into maint

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

824f4a93890b06d47d46f87b146022266977b2a9