Merge branch 'po/remote-set-head-usage'

* po/remote-set-head-usage:
remote set-head -h: add long options to synopsis
remote doc: document long forms of set-head options

diff --combined builtin/remote.c
index eaac3e20124c48456faab48a6529ed281075ee25,aa008a50a571f0a1bdd8cfa96dda79328ceaf356..4e14891095e6ea016b9f44262ae300c42a75e1b2
--- 1/builtin/remote.c
--- 2/builtin/remote.c
+++ b/builtin/remote.c
@@@ -12,7 -12,7 +12,7 @@@ static const char * const builtin_remot
        N_("git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>"),
        N_("git remote rename <old> <new>"),
        N_("git remote remove <name>"),
-       N_("git remote set-head <name> (-a | -d | <branch>)"),
+       N_("git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"),
        N_("git remote [-v | --verbose] show [-n] <name>"),
        N_("git remote prune [-n | --dry-run] <name>"),
        N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
@@@ -39,7 -39,7 +39,7 @@@ static const char * const builtin_remot
  };
  
  static const char * const builtin_remote_sethead_usage[] = {
-       N_("git remote set-head <name> (-a | -d | <branch>)"),
+       N_("git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"),
        NULL
  };
  
@@@ -160,7 -160,7 +160,7 @@@ static int add(int argc, const char **a
        int i;
  
        struct option options[] = {
 -              OPT_BOOLEAN('f', "fetch", &fetch, N_("fetch the remote branches")),
 +              OPT_BOOL('f', "fetch", &fetch, N_("fetch the remote branches")),
                OPT_SET_INT(0, "tags", &fetch_tags,
                            N_("import all tags and associated objects when fetching"),
                            TAGS_SET),
@@@ -1088,7 -1088,7 +1088,7 @@@ static int show(int argc, const char **
  {
        int no_query = 0, result = 0, query_flag = 0;
        struct option options[] = {
 -              OPT_BOOLEAN('n', NULL, &no_query, N_("do not query remotes")),
 +              OPT_BOOL('n', NULL, &no_query, N_("do not query remotes")),
                OPT_END()
        };
        struct ref_states states;
@@@ -1195,10 -1195,10 +1195,10 @@@ static int set_head(int argc, const cha
        char *head_name = NULL;
  
        struct option options[] = {
 -              OPT_BOOLEAN('a', "auto", &opt_a,
 -                          N_("set refs/remotes/<name>/HEAD according to remote")),
 -              OPT_BOOLEAN('d', "delete", &opt_d,
 -                          N_("delete refs/remotes/<name>/HEAD")),
 +              OPT_BOOL('a', "auto", &opt_a,
 +                       N_("set refs/remotes/<name>/HEAD according to remote")),
 +              OPT_BOOL('d', "delete", &opt_d,
 +                       N_("delete refs/remotes/<name>/HEAD")),
                OPT_END()
        };
        argc = parse_options(argc, argv, NULL, options, builtin_remote_sethead_usage,
@@@ -1317,8 -1317,8 +1317,8 @@@ static int update(int argc, const char 
  {
        int i, prune = 0;
        struct option options[] = {
 -              OPT_BOOLEAN('p', "prune", &prune,
 -                          N_("prune remotes after fetching")),
 +              OPT_BOOL('p', "prune", &prune,
 +                       N_("prune remotes after fetching")),
                OPT_END()
        };
        const char **fetch_argv;
@@@ -1404,7 -1404,7 +1404,7 @@@ static int set_branches(int argc, cons
  {
        int add_mode = 0;
        struct option options[] = {
 -              OPT_BOOLEAN('\0', "add", &add_mode, N_("add branch")),
 +              OPT_BOOL('\0', "add", &add_mode, N_("add branch")),
                OPT_END()
        };
  
@@@ -1432,11 -1432,11 +1432,11 @@@ static int set_url(int argc, const cha
        int urlset_nr;
        struct strbuf name_buf = STRBUF_INIT;
        struct option options[] = {
 -              OPT_BOOLEAN('\0', "push", &push_mode,
 -                          N_("manipulate push URLs")),
 -              OPT_BOOLEAN('\0', "add", &add_mode,
 -                          N_("add URL")),
 -              OPT_BOOLEAN('\0', "delete", &delete_mode,
 +              OPT_BOOL('\0', "push", &push_mode,
 +                       N_("manipulate push URLs")),
 +              OPT_BOOL('\0', "add", &add_mode,
 +                       N_("add URL")),
 +              OPT_BOOL('\0', "delete", &delete_mode,
                            N_("delete URLs")),
                OPT_END()
        };