Merge branch 'ab/pull-rebase-config'

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

Junio C Hamano committed Dec 9, 2011 at 13:37 UTC 1ee740e66975adbab080301ebd364e253be3d513

No changes.