Merge branch 'cn/pull-rebase-message'

By Carlos Martín Nieto * cn/pull-rebase-message: Make git-{pull,rebase} message without tracking information friendlier

Junio C Hamano committed Mar 6, 2012 at 14:53 UTC 4b4ec3fc6480312515e1ec3d827c1308c00adc1e

No changes.