Merge branch 'ja/maint-pull-rebase-doc' into maint
* ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase
Junio C Hamano committed
Dec 14, 2010 at 07:36 UTC
b69fb7866b24b205a876a6a0b256c786a58419c7
No changes.