Merge branch 'pj/remote-set-branches-usage-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 23:33:33 +0000 (15:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 23:33:33 +0000 (15:33 -0800)
commit67f8d5b87d8ec3dcdb311f31b534332b74c93142
tree6d77a87d8ca5045d0e539e3444b25be830115cd4
parente22c522730b0fc1dd2a1f12b6e508c5fb2e0fe6c
parentca5bc9e61fb26969c9b028c9b853af109f9f00c5
Merge branch 'pj/remote-set-branches-usage-fix' into maint

* pj/remote-set-branches-usage-fix:
  remote: fix set-branches usage and documentation

Conflicts:
builtin/remote.c
Documentation/git-remote.txt
builtin/remote.c