summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-27 15:33:33 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-27 15:33:33 -0800
commit67f8d5b87d8ec3dcdb311f31b534332b74c93142 (patch)
tree6d77a87d8ca5045d0e539e3444b25be830115cd4
parente22c522730b0fc1dd2a1f12b6e508c5fb2e0fe6c (diff)
parentca5bc9e61fb26969c9b028c9b853af109f9f00c5 (diff)
downloadgit-67f8d5b87d8ec3dcdb311f31b534332b74c93142.tar.gz
Merge branch 'pj/remote-set-branches-usage-fix' into maint
* pj/remote-set-branches-usage-fix: remote: fix set-branches usage and documentation Conflicts: builtin/remote.c
-rw-r--r--Documentation/git-remote.txt2
-rw-r--r--builtin/remote.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 5a8c5061f3..d376d19ef7 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -14,7 +14,7 @@ SYNOPSIS
'git remote rename' <old> <new>
'git remote rm' <name>
'git remote set-head' <name> (-a | -d | <branch>)
-'git remote set-branches' <name> [--add] <branch>...
+'git remote set-branches' [--add] <name> <branch>...
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
'git remote set-url --add' [--push] <name> <newurl>
'git remote set-url --delete' [--push] <name> <url>
diff --git a/builtin/remote.c b/builtin/remote.c
index 583eec90e0..adc456ebef 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>",