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.

diff --cc builtin-remote.c
index 4f4cba4976a730219c66b76b75fc354b74aa7d2e,c4edb86530873583465e69e68f3aeda7993e8a7b..67761d5ab3594dadf15126d9c60dc16ec22ff147
--- 1/builtin-remote.c
--- 2/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
  };