Merge branch 'ja/maint-pull-rebase-doc' into next
commit211bf892755a067e200dd428815e705763d3a947
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:28 +0000 (8 12:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:28 +0000 (8 12:25 -0800)
treeb8e672f49d48638d8452b7eb8fec23af52a97544
parent32573659bd6b6ba2f1f70dbd54d4540920c7ff51
parentc4f4157ee84ff27dd7a398f80002be59eb2f69e7
Merge branch 'ja/maint-pull-rebase-doc' into next

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