Merge branch 'jc/fetch-ignore-symref'
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 07:41:37 +0000 (23:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 07:41:37 +0000 (23:41 -0800)
Avoid false error from an attempt to update local symbolic ref via
fetch.

* jc/fetch-ignore-symref:
fetch: ignore wildcarded refspecs that update local symbolic refs

1  2 
remote.c
diff --cc remote.c
Simple merge