Merge branch 'jn/remote-set-branches'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:55 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:55 +0000 (11:16 -0700)
commit1c5d6b2a401576f74c76f56dae0204604235705c
treef661cd3c4092346516d5f3ecb06fa2687ca9978e
parent199d4c0d434623eafc3a93dddad756ec029f57ff
parent3d8b69495fd1132d5af6d7f46425cca97a937d97
Merge branch 'jn/remote-set-branches'

* jn/remote-set-branches:
  Add git remote set-branches

Conflicts:
builtin/remote.c
Documentation/git-remote.txt
builtin/remote.c
t/t5505-remote.sh