diff options
| author |  Philip Jägenstedt <philip.jagenstedt@gmail.com> | 2012-02-18 12:17:47 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-02-19 23:44:38 -0800 |
| commit | ca5bc9e61fb26969c9b028c9b853af109f9f00c5 (patch) | |
| tree | 33d45f9a5d7c9454d8dbf36f3b6fce047e21870d | |
| parent | remote: fix set-branches usage (diff) | |
| download | tgif-ca5bc9e61fb26969c9b028c9b853af109f9f00c5.tar.xz | |
remote: fix set-branches usage and documentation
The canonical order of command line arguments is always to have dashed
commands before other parameters, but the "git remote set-branches"
subcommand was described to take "name" before an optional "--add".
Signed-off-by: Philip Jägenstedt <philip@foolip.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-remote.txt | 2 | ||||
| -rw-r--r-- | builtin/remote.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index de4386bf7e..7112f94000 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 06741ecde4..7f3514b708 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>", |