Merge branch 'aw/rebase-i-p' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jul 2011 18:52:46 +0000 (11:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jul 2011 18:52:46 +0000 (11:52 -0700)
commitdf3f3d8773c231ae9cad32bedb5927d4b5f943df
treeab48437ea7999542ce424f17aeaac948876604cd
parent476eee4406baa4597bd364900611932004ba8fb3
parent12bf828348922935b1d5ca10f2d829c9a64b6e41
Merge branch 'aw/rebase-i-p' into next

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