| commit | 23f229d8cd02eb933512637b617be5ea85d4a608 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jul 2011 21:31:36 +0000 (13 14:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jul 2011 21:31:36 +0000 (13 14:31 -0700) | ||
| tree | cf0b2731a3c39ec4155352c75da4e8ec2029ca54 | treesnapshot (tar.gz zip) |
| parent | 551d75dbd80cb6af08376ea8a12bdaa3f5860f35 | commitdiff |
| parent | 12bf828348922935b1d5ca10f2d829c9a64b6e41 | commitdiff |
Merge branch 'aw/rebase-i-p'
* 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