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)
commit1ee740e66975adbab080301ebd364e253be3d513
tree672932e73881b55204ec237b9047c8532d891a61
parentef87690b27fd1facdc8cc48f6789a930939303a3
parent6b37dff17f176d7e87efa93b4cf521dd725de247
Merge branch 'ab/pull-rebase-config'

* ab/pull-rebase-config:
  pull: introduce a pull.rebase option to enable --rebase
Documentation/config.txt
Documentation/git-pull.txt
git-pull.sh