Merge branch 'tr/remote-tighten-commandline-parsing' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 May 2013 22:12:38 +0000 (15:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 May 2013 22:12:38 +0000 (15:12 -0700)
* tr/remote-tighten-commandline-parsing:
remote: 'show' and 'prune' can take more than one remote
remote: check for superfluous arguments in 'git remote add'
remote: add a test for extra arguments, according to docs

Trivial merge