Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maint
commit6a293703afb10125fdff7a57a80e88298ac3f584
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 20:41:45 +0000 (12 13:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 20:41:45 +0000 (12 13:41 -0700)
tree180bc2c3d504cce116e25ce7d80e52375e2b9d60
parent41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d
parentc68c408a7a53736ae087a68ad0ce2cf7c4cab0a2
Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maint

* jc/t5516-pushInsteadOf-vs-pushURL:
  t5516: test interaction between pushURL and pushInsteadOf correctly