]> granicus.if.org Git - git/commitdiff
Merge branch 'jk/remote-pushremote-config-reading'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:26:04 +0000 (14:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:26:05 +0000 (14:26 -0700)
"git push" did not pay attention to branch.*.pushremote if it is
defined earlier than remote.pushdefault; the order of these two
variables in the configuration file should not matter, but it did by
mistake.

* jk/remote-pushremote-config-reading:
  remote: handle pushremote config in any order

1  2 
remote.c
t/t5516-fetch-push.sh

diff --cc remote.c
Simple merge
Simple merge