summaryrefslogtreecommitdiff
path: root/builtin/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-23 13:30:00 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-23 13:30:00 -0800
commitbba612300149bacd3d0643d13ffa66b49185d151 (patch)
tree9e6679c44888e8a7f450b60a546524541a7571cc /builtin/remote.c
parentb12fb9abfbef0d43630ff5d4b521630d6032bae7 (diff)
parentca5bc9e61fb26969c9b028c9b853af109f9f00c5 (diff)
downloadgit-bba612300149bacd3d0643d13ffa66b49185d151.tar.gz
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
Diffstat (limited to 'builtin/remote.c')
-rw-r--r--builtin/remote.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/remote.c b/builtin/remote.c
index f54a89adc7..fec92bc66e 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -16,7 +16,7 @@ static const char * const builtin_remote_usage[] = {
"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 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>",