Merge branch 'ab/pull-rebase-config'
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:37:01 +0000 (13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:37:01 +0000 (13:37 -0800)
commit1ee740e...6975adbab080301ebd364e253be3d513
tree672932e...3881b55204ec237b9047c8532d891a61copy hash to clipboard (tree)
parentef87690...27fd1facdc8cc48f6789a930939303a3copy hash to clipboard (diff)
parent6b37dff...7f176d7e87efa93b4cf521dd725de247copy hash to clipboard (diff)
Documentation/config.txt
Documentation/git-pull.txt
git-pull.sh