Merge branch 'mz/empty-rebase-test' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:08:48 +0000 (11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:08:48 +0000 (11:08 -0700)
* mz/empty-rebase-test:
add tests for 'git rebase --keep-empty'

Trivial merge