From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Dec 2009 21:52:31 +0000 (-0800)
Subject: Merge branch 'th/maint-remote-update-help-string' into maint
X-Git-Tag: v1.6.5.5~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d718c19bc686a15ed69cd7631e50613dd4901e03;p=thirdparty%2Fgit.git

Merge branch 'th/maint-remote-update-help-string' into maint

* th/maint-remote-update-help-string:
  Update 'git remote update' usage string to match man page.
---

d718c19bc686a15ed69cd7631e50613dd4901e03
diff --cc builtin-remote.c
index 4f4cba4976,c4edb86530..67761d5ab3
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@@ -12,10 -12,10 +12,10 @@@ static const char * const builtin_remot
  	"git remote add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>",
  	"git remote rename <old> <new>",
  	"git remote rm <name>",
 -	"git remote set-head <name> [-a | -d | <branch>]",
 -	"git remote show [-n] <name>",
 +	"git remote set-head <name> (-a | -d | <branch>)",
 +	"git remote [-v | --verbose] show [-n] <name>",
  	"git remote prune [-n | --dry-run] <name>",
- 	"git remote [-v | --verbose] update [-p | --prune] [group]",
+ 	"git remote [-v | --verbose] update [-p | --prune] [group | remote]",
  	NULL
  };