Merge branch 'jk/push-simple'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Dec 2014 22:31:40 +0000 (14:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Dec 2014 22:31:40 +0000 (14:31 -0800)
Git 2.0 was supposed to make the "simple" mode for the default of
"git push", but it didn't.

* jk/push-simple:
push: truly use "simple" as default, not "upstream"

1  2 
builtin/push.c
diff --cc builtin/push.c
Simple merge