summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-14 07:36:23 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-14 07:36:23 -0800
commitb69fb7866b24b205a876a6a0b256c786a58419c7 (patch)
tree3c26bb515502f2986ec22af212e8c660845e8ae9 /Makefile
parent6b090e1710dbdf3f2c9f46c7f089ce34399b35c5 (diff)
parentc4f4157ee84ff27dd7a398f80002be59eb2f69e7 (diff)
downloadgit-b69fb7866b24b205a876a6a0b256c786a58419c7.tar.gz
Merge branch 'ja/maint-pull-rebase-doc' into maint
* ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions