From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Aug 2012 19:05:47 +0000 (-0700)
Subject: Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11
X-Git-Tag: v1.7.11.6~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1103996ea4680329baf3853984499b623c6da839?ds=sidebyside

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
---

1103996ea4680329baf3853984499b623c6da839