Merge branch 'nh/empty-rebase'

By Neil Horman * nh/empty-rebase: git cherry-pick: do not dereference a potential NULL pointer

Junio C Hamano committed May 7, 2012 at 13:29 UTC 5543501ced8e3303b7612b068831a111af0ab8b7

No changes.