Code

Merge branch 'th/maint-remote-update-help-string'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:41:54 +0000 (16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:41:54 +0000 (16:41 -0800)
* th/maint-remote-update-help-string:
  Update 'git remote update' usage string to match man page.

1  2 
builtin-remote.c

index c361e2ddb04ac146fc429021e0be39e741a8f641,c4edb86530873583465e69e68f3aeda7993e8a7b..b08608ef967a86ae6838bc5e5fd775697d212e0b
@@@ -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
  };