From: Junio C Hamano Date: Tue, 14 Dec 2010 15:36:23 +0000 (-0800) Subject: Merge branch 'ja/maint-pull-rebase-doc' into maint X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b69fb7866b24b205a876a6a0b256c786a58419c7;p=git.git Merge branch 'ja/maint-pull-rebase-doc' into maint * ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase --- b69fb7866b24b205a876a6a0b256c786a58419c7