From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Feb 2012 21:30:00 +0000 (-0800)
Subject: Merge branch 'pj/remote-set-branches-usage-fix'
X-Git-Tag: v1.7.10-rc0~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bba612300149bacd3d0643d13ffa66b49185d151;p=git.git

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
---

bba612300149bacd3d0643d13ffa66b49185d151
diff --cc builtin/remote.c
index f54a89adc,7f3514b70..fec92bc66
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@@ -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>",