From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Dec 2010 05:49:53 +0000 (-0800)
Subject: Merge branch 'ja/maint-pull-rebase-doc'
X-Git-Tag: v1.7.4-rc0~49
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5c178143088350c49129acbedb864d70c666215;p=git.git

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

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

b5c178143088350c49129acbedb864d70c666215