![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Aug 2011 18:23:25 +0000 (11:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Aug 2011 18:23:25 +0000 (11:23 -0700) | ||
| commit | 824f4a93890b06d47d46f87b146022266977b2a9 | |
| tree | e90d1d69b8ea78a0a89ee1a9c7fa90cecd69778f | tree | snapshot |
| parent | f253376dcbadb384d8c8af287c3f9e2271cb5ff4 | commit | diff |
| parent | 12bf828348922935b1d5ca10f2d829c9a64b6e41 | commit | diff |
Merge branch 'aw/rebase-i-p' into maint
* aw/rebase-i-p:
rebase -i -p: include non-first-parent commits in todo list
* aw/rebase-i-p:
rebase -i -p: include non-first-parent commits in todo list