Merge branch 'ja/maint-pull-rebase-doc'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:53 +0000 (21:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:53 +0000 (21:49 -0800)
commitb5c178143088350c49129acbedb864d70c666215
tree0700cd77ab20d235cd94dab11280f7ac7e40c450
parent52cb57324a5d826082cc945896b47c7a783321c0
parentc4f4157ee84ff27dd7a398f80002be59eb2f69e7
Merge branch 'ja/maint-pull-rebase-doc'

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