From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Dec 2010 15:36:23 +0000 (-0800)
Subject: Merge branch 'ja/maint-pull-rebase-doc' into maint
X-Git-Tag: v1.7.3.4~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b69fb7866b24b205a876a6a0b256c786a58419c7;p=git.git

Merge branch 'ja/maint-pull-rebase-doc' into maint

* ja/maint-pull-rebase-doc:
  git-pull.txt: Mention branch.autosetuprebase
---

b69fb7866b24b205a876a6a0b256c786a58419c7