Code

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

1  2 
Documentation/git-pull.txt

Simple merge