Merge branch 'pj/remote-set-branches-usage-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 21:30:00 +0000 (13:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 21:30:00 +0000 (13:30 -0800)
commitbba612300149bacd3d0643d13ffa66b49185d151
tree9e6679c44888e8a7f450b60a546524541a7571cc
parentb12fb9abfbef0d43630ff5d4b521630d6032bae7
parentca5bc9e61fb26969c9b028c9b853af109f9f00c5
Merge branch 'pj/remote-set-branches-usage-fix'

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

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