Merge branch 'mp/push-pushoption-config'

The "--push-option=<string>" option to "git push" now defaults to a
list of strings configured via push.pushOption variable.

* mp/push-pushoption-config:
builtin/push.c: add push.pushOption config

diff --cc Documentation/config.txt
Simple merge