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)
* pj/remote-set-branches-usage-fix:
  remote: fix set-branches usage and documentation

Conflicts:
builtin/remote.c

1  2 
Documentation/git-remote.txt
builtin/remote.c

Simple merge
@@@ -15,8 -15,8 +15,8 @@@ static const char * const builtin_remot
        "git remote set-head <name> (-a | -d | <branch>)",
        "git remote [-v | --verbose] show [-n] <name>",
        "git remote prune [-n | --dry-run] <name>",
 -      "git remote [-v | --verbose] update [-p | --prune] [group | remote]",
 +      "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]",
-       "git remote set-branches <name> [--add] <branch>...",
+       "git remote set-branches [--add] <name> <branch>...",
        "git remote set-url <name> <newurl> [<oldurl>]",
        "git remote set-url --add <name> <newurl>",
        "git remote set-url --delete <name> <url>",