Merge branch 'ab/pull-rebase-config'

* ab/pull-rebase-config:
pull: introduce a pull.rebase option to enable --rebase

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-pull.txt
Simple merge

diff --cc git-pull.sh
Simple merge