Merge branch 'pj/remote-set-branches-usage-fix' into next
commitcb71d0e4f2b7cfaa31a14a02348da50bb128ce25
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Feb 2012 00:02:41 +0000 (21 16:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Feb 2012 00:02:41 +0000 (21 16:02 -0800)
treeb643ec67a5e15b1f17612cc3c795d899639f99d9
parent79d7ccc8ff922823e00b430ce63f2c9047c83857
parentca5bc9e61fb26969c9b028c9b853af109f9f00c5
Merge branch 'pj/remote-set-branches-usage-fix' into next

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

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