th/remote-usage

[Jonathan Nieder <jrnieder@gmail.com>]

Junio C Hamano wrote:
> [New Topics]
> 
> * th/remote-usage (2009-11-16) 1 commit.
>  - git remote: Separate usage strings for subcommands

Glancing at pu^2, I had two small nitpicks: [<options>...] is five
characters longer than strictly necessary, and the argument to git
remote set-head is not actually optional.

In other words, would it make sense to squash in something like the
following?

-- %< --
Subject: Tweak 'git remote' usage strings

The set-head argument is not optional.  <options>... is five
characters wider than it needs to be.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 builtin-remote.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/builtin-remote.c b/builtin-remote.c
index ee86810..cfd8a36 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -7,14 +7,14 @@
 #include "run-command.h"
 #include "refs.h"
 
-#define REMOTE_BARE_USAGE "git remote [<options>...]"
-#define REMOTE_ADD_USAGE "git remote add [<options>...] <name> <url>"
+#define REMOTE_BARE_USAGE "git remote [options]"
+#define REMOTE_ADD_USAGE "git remote add [options] <name> <url>"
 #define REMOTE_RENAME_USAGE "git remote rename <old> <new>"
 #define REMOTE_RM_USAGE "git remote rm <name>"
-#define REMOTE_SETHEAD_USAGE "git remote set-head <name> [<options>...]"
-#define REMOTE_SHOW_USAGE "git remote show [<options>...] <name>"
-#define REMOTE_PRUNE_USAGE "git remote prune [<options>...] <name>"
-#define REMOTE_UPDATE_USAGE "git remote update [<options>...]"
+#define REMOTE_SETHEAD_USAGE "git remote set-head <name> (-a|-d|<branch>)"
+#define REMOTE_SHOW_USAGE "git remote show [options] <name>"
+#define REMOTE_PRUNE_USAGE "git remote prune [options] <name>"
+#define REMOTE_UPDATE_USAGE "git remote update [options]"
 
 static const char * const builtin_remote_usage[] = {
 	REMOTE_BARE_USAGE,
-- 
1.6.5.2