Merge branch 'mm/push-simple-doc'

The documentation did not clearly state that the 'simple' mode is
now the default for "git push" when push.default configuration is
not set.

* mm/push-simple-doc:
Documentation/git-push: document that 'simple' is the default

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