Code

Merge branch 'ja/maint-pull-rebase-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 15:36:23 +0000 (07:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 15:36:23 +0000 (07:36 -0800)
commitb69fb7866b24b205a876a6a0b256c786a58419c7
tree3c26bb515502f2986ec22af212e8c660845e8ae9
parent6b090e1710dbdf3f2c9f46c7f089ce34399b35c5
parentc4f4157ee84ff27dd7a398f80002be59eb2f69e7
Merge branch 'ja/maint-pull-rebase-doc' into maint

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