Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 19:05:47 +0000 (12:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 19:05:47 +0000 (12:05 -0700)
A minor documentation update.

* mv/pull-r-for-rebase:
man: git pull -r is a short for --rebase

Trivial merge