Code

Merge branch 'mz/remote-rename' into maint-1.7.6
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:19 +0000 (16:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:19 +0000 (16:12 -0700)
* mz/remote-rename:
  remote: only update remote-tracking branch if updating refspec
  remote rename: warn when refspec was not updated
  remote: "rename o foo" should not rename ref "origin/bar"
  remote: write correct fetch spec when renaming remote 'remote'


Trivial merge