Code

Merge branch 'mg/pushurl'
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:47:27 +0000 (21:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:47:27 +0000 (21:47 -0700)
* mg/pushurl:
  avoid NULL dereference on failed malloc
  builtin-remote: Make "remote -v" display push urls
  builtin-remote: Show push urls as well
  technical/api-remote: Describe new struct remote member pushurl
  t5516: Check pushurl config setting
  Allow push and fetch urls to be different

1  2 
builtin-remote.c
remote.c
remote.h

Simple merge
diff --cc remote.c
Simple merge
diff --cc remote.h
Simple merge