[PATCH] remote: align set-branches builtin usage and documentation

[PATCH] remote: align set-branches builtin usage and documentation

[Philip Jägenstedt]

The order of [--add] <name> <branch>... was inconsistent
between builtin remote usage messages and git-remote.txt.
Align it closer to the order used in set-url.

Signed-off-by: Philip Jägenstedt <philip@foolip.org>
---
 Documentation/git-remote.txt |    2 +-
 builtin/remote.c             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 5a8c506..d376d19 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 f54a89a..fec92bc 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>",
-- 
1.7.9.1.246.g77c8c.dirty

Re: [PATCH] remote: align set-branches builtin usage and documentation

[Philip Jägenstedt]

On Sat, Feb 18, 2012 at 12:17, Philip Jägenstedt
<philip.jagenstedt@gmail.com> wrote:

> The order of [--add] <name> <branch>... was inconsistent
> between builtin remote usage messages and git-remote.txt.

To clarify, it's the order of "git remote set-branches" that is
inconsistent with the two instances the patch touches:

usage: git remote set-branches <name> <branch>...
   or: git remote set-branches --add <name> <branch>...

-- 
Philip Jägenstedt