Merge branch 'mm/push-simple-doc'
commit1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2016 21:37:21 +0000 (26 13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2016 21:37:21 +0000 (26 13:37 -0800)
tree9e67ad97cdf84b3ffaf501f3bf62ed040cacb522
parent2a24444aaeaabd8559751b02015c025157604f38
parentf6b1fb372ee164e4cb2d15a9a325e13685f9dc2d
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
Documentation/git-push.txt