Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11

A minor documentation update. * mv/pull-r-for-rebase: man: git pull -r is a short for --rebase

Junio C Hamano committed Aug 24, 2012 at 12:05 UTC 1103996ea4680329baf3853984499b623c6da839

No changes.