Merge branch 'mk/maint-cg-push'
commit3fdd37fe1520765d1d207737ab65415e3d2ca174
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 06:26:24 +0000 (12 22:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 06:26:24 +0000 (12 22:26 -0800)
tree7b3372412421ba23026a0b902b14a23dea79496a
parentecbbfb15a42987deb6620c4575c420002313af23
parent18afe101eb2c2f68ba58085515f592148128fba3
Merge branch 'mk/maint-cg-push'

* mk/maint-cg-push:
  git push: Interpret $GIT_DIR/branches in a Cogito compatible way

Conflicts:
t/t5516-fetch-push.sh
remote.c
t/t5516-fetch-push.sh