Merge branch 'mm/push-simple-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:44 +0000 (11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:44 +0000 (11:13 -0800)
commitd4e7b9bcb0ca9ef976b765b0daf29b4c1466db48
treec8837968f27013f1988c08c5bfebb654c9e4174e
parentb7a6ec609ff10652541e7f716fcecf7865b94b23
parentf6b1fb372ee164e4cb2d15a9a325e13685f9dc2d
Merge branch 'mm/push-simple-doc' into maint

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
Documentation/git-push.txt