{"thread":{"id":"21026","subject":"[PATCH v2] Trivial fix: Make all the usage strings to use the same pattern.","startedAt":"2009-09-22T16:51:40Z","lastAt":"2009-09-22T16:51:40Z","messageCount":1,"participants":["Thiago Farina"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"123642","messageId":"1253638300-8666-1-git-send-email-tfransosi@gmail.com","threadId":"21026","inReplyTo":null,"subject":"[PATCH v2] Trivial fix: Make all the usage strings to use the same pattern.","fromName":"Thiago Farina","fromEmail":"tfransosi@gmail.com","sentAt":"2009-09-22T16:51:40Z","receivedAt":"2009-09-22T16:51:40Z","isPatch":true,"sender":{"key":"tfransosi@gmail.com","avatar":"https://avatars.githubusercontent.com/u/970071?v=4"},"body":"They follow the below pattern:\nGit command: git command-name\nUsage string: git_command_name_usage\n\nAlso changes \"static char const * const\" to \"static const char * const\" to\nmatch with the definition in api-builtin.txt.\n\nSigned-off-by: Thiago Farina <tfransosi@gmail.com>\n---\n archive.c                    |    6 +++---\n builtin-add.c                |    4 ++--\n builtin-apply.c              |    4 ++--\n builtin-bisect--helper.c     |    6 +++---\n builtin-blame.c              |    9 +++++----\n builtin-branch.c             |    8 ++++----\n builtin-bundle.c             |    6 +++---\n builtin-cat-file.c           |   12 ++++++------\n builtin-check-attr.c         |    8 ++++----\n builtin-checkout-index.c     |    4 ++--\n builtin-checkout.c           |    4 ++--\n builtin-clean.c              |    4 ++--\n builtin-clone.c              |    4 ++--\n builtin-commit-tree.c        |    7 ++++---\n builtin-commit.c             |    8 ++++----\n builtin-config.c             |   16 ++++++++--------\n builtin-count-objects.c      |    6 +++---\n builtin-describe.c           |    4 ++--\n builtin-diff-files.c         |    6 +++---\n builtin-diff-index.c         |    6 +++---\n builtin-diff-tree.c          |    6 +++---\n builtin-diff.c               |   24 ++++++++++++------------\n builtin-fast-export.c        |    8 ++++----\n builtin-fetch-pack.c         |    6 +++---\n builtin-fetch.c              |    4 ++--\n builtin-fmt-merge-msg.c      |    6 +++---\n builtin-for-each-ref.c       |   10 +++++-----\n builtin-fsck.c               |    4 ++--\n builtin-gc.c                 |    6 +++---\n builtin-grep.c               |    4 ++--\n builtin-help.c               |    4 ++--\n builtin-init-db.c            |    6 +++---\n builtin-log.c                |   16 ++++++++--------\n builtin-ls-files.c           |    4 ++--\n builtin-ls-remote.c          |    6 +++---\n builtin-ls-tree.c            |    8 ++++----\n builtin-mailinfo.c           |    8 ++++----\n builtin-merge-base.c         |    6 +++---\n builtin-merge-file.c         |    6 +++---\n builtin-merge.c              |   10 +++++-----\n builtin-mktree.c             |    6 +++---\n builtin-mv.c                 |    8 ++++----\n builtin-name-rev.c           |    6 +++---\n builtin-pack-objects.c       |   18 +++++++++---------\n builtin-pack-refs.c          |    6 +++---\n builtin-prune-packed.c       |    4 ++--\n builtin-prune.c              |    4 ++--\n builtin-push.c               |    6 +++---\n builtin-read-tree.c          |    4 ++--\n builtin-receive-pack.c       |    8 ++++----\n builtin-reflog.c             |    4 ++--\n builtin-remote.c             |   26 +++++++++++++-------------\n builtin-rev-list.c           |    6 +++---\n builtin-rev-parse.c          |    2 +-\n builtin-revert.c             |    6 +++---\n builtin-rm.c                 |    6 +++---\n builtin-send-pack.c          |    8 ++++----\n builtin-shortlog.c           |    8 ++++----\n builtin-show-branch.c        |    6 +++---\n builtin-show-ref.c           |    4 ++--\n builtin-tar-tree.c           |    4 ++--\n builtin-unpack-objects.c     |    7 ++++---\n builtin-update-index.c       |    4 ++--\n builtin-update-server-info.c |    6 +++---\n builtin-upload-archive.c     |    5 ++---\n builtin-verify-pack.c        |    6 +++---\n builtin-verify-tag.c         |    6 +++---\n builtin-write-tree.c         |    4 ++--\n daemon.c                     |    4 ++--\n fast-import.c                |    4 ++--\n hash-object.c                |    6 +++---\n http-push.c                  |    4 ++--\n index-pack.c                 |   10 +++++-----\n merge-tree.c                 |    6 ++++--\n pack-redundant.c             |    4 ++--\n patch-id.c                   |    4 ++--\n upload-pack.c                |    5 +++--\n var.c                        |    6 +++---\n 78 files changed, 265 insertions(+), 260 deletions(-)\n\ndiff --git a/archive.c b/archive.c\nindex 73b8e8a..51581f7 100644\n--- a/archive.c\n+++ b/archive.c\n@@ -6,7 +6,7 @@\n #include \"parse-options.h\"\n #include \"unpack-trees.h\"\n \n-static char const * const archive_usage[] = {\n+static const char * const git_archive_usage[] = {\n \t\"git archive [options] <tree-ish> [path...]\",\n \t\"git archive --list\",\n \t\"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [path...]\",\n@@ -309,7 +309,7 @@ static int parse_archive_args(int argc, const char **argv,\n \t\tOPT_END()\n \t};\n \n-\targc = parse_options(argc, argv, NULL, opts, archive_usage, 0);\n+\targc = parse_options(argc, argv, NULL, opts, git_archive_usage, 0);\n \n \tif (remote)\n \t\tdie(\"Unexpected option --remote\");\n@@ -329,7 +329,7 @@ static int parse_archive_args(int argc, const char **argv,\n \n \t/* We need at least one parameter -- tree-ish */\n \tif (argc < 1)\n-\t\tusage_with_options(archive_usage, opts);\n+\t\tusage_with_options(git_archive_usage, opts);\n \t*ar = lookup_archiver(format);\n \tif (!*ar)\n \t\tdie(\"Unknown archive format '%s'\", format);\ndiff --git a/builtin-add.c b/builtin-add.c\nindex cb6e590..a4a1976 100644\n--- a/builtin-add.c\n+++ b/builtin-add.c\n@@ -13,7 +13,7 @@\n #include \"diff.h\"\n #include \"revision.h\"\n \n-static const char * const builtin_add_usage[] = {\n+static const char * const git_add_usage[] = {\n \t\"git add [options] [--] <filepattern>...\",\n \tNULL\n };\n@@ -287,7 +287,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)\n \tgit_config(add_config, NULL);\n \n \targc = parse_options(argc, argv, prefix, builtin_add_options,\n-\t\t\t  builtin_add_usage, PARSE_OPT_KEEP_ARGV0);\n+\t\t\t  git_add_usage, PARSE_OPT_KEEP_ARGV0);\n \tif (patch_interactive)\n \t\tadd_interactive = 1;\n \tif (add_interactive)\ndiff --git a/builtin-apply.c b/builtin-apply.c\nindex c8372a0..3bd5df6 100644\n--- a/builtin-apply.c\n+++ b/builtin-apply.c\n@@ -47,7 +47,7 @@ static int no_add;\n static const char *fake_ancestor;\n static int line_termination = '\\n';\n static unsigned int p_context = UINT_MAX;\n-static const char * const apply_usage[] = {\n+static const char * const git_apply_usage[] = {\n \t\"git apply [options] [<patch>...]\",\n \tNULL\n };\n@@ -3567,7 +3567,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)\n \t\tparse_ignorewhitespace_option(apply_default_ignorewhitespace);\n \n \targc = parse_options(argc, argv, prefix, builtin_apply_options,\n-\t\t\tapply_usage, 0);\n+\t\t\tgit_apply_usage, 0);\n \n \tif (apply_with_reject)\n \t\tapply = apply_verbosely = 1;\ndiff --git a/builtin-bisect--helper.c b/builtin-bisect--helper.c\nindex 5b22639..41aad99 100644\n--- a/builtin-bisect--helper.c\n+++ b/builtin-bisect--helper.c\n@@ -3,7 +3,7 @@\n #include \"parse-options.h\"\n #include \"bisect.h\"\n \n-static const char * const git_bisect_helper_usage[] = {\n+static const char * const builtin_bisect_helper_usage[] = {\n \t\"git bisect--helper --next-all\",\n \tNULL\n };\n@@ -18,10 +18,10 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)\n \t};\n \n \targc = parse_options(argc, argv, prefix, options,\n-\t\t\t     git_bisect_helper_usage, 0);\n+\t\t\t     builtin_bisect_helper_usage, 0);\n \n \tif (!next_all)\n-\t\tusage_with_options(git_bisect_helper_usage, options);\n+\t\tusage_with_options(builtin_bisect_helper_usage, options);\n \n \t/* next-all */\n \treturn bisect_next_all(prefix);\ndiff --git a/builtin-blame.c b/builtin-blame.c\nindex 7512773..9fec5dd 100644\n--- a/builtin-blame.c\n+++ b/builtin-blame.c\n@@ -21,10 +21,11 @@\n #include \"parse-options.h\"\n #include \"utf8.h\"\n \n-static char blame_usage[] = \"git blame [options] [rev-opts] [rev] [--] file\";\n+static const char git_blame_usage[] =\n+\"git blame [options] [rev-opts] [rev] [--] file\";\n \n static const char *blame_opt_usage[] = {\n-\tblame_usage,\n+\tgit_blame_usage,\n \t\"\",\n \t\"[rev-opts] are documented in git-rev-list(1)\",\n \tNULL\n@@ -1948,10 +1949,10 @@ static void prepare_blame_range(struct scoreboard *sb,\n \tif (*term == ',') {\n \t\tterm = parse_loc(term + 1, sb, lno, *bottom + 1, top);\n \t\tif (*term)\n-\t\t\tusage(blame_usage);\n+\t\t\tusage(git_blame_usage);\n \t}\n \tif (*term)\n-\t\tusage(blame_usage);\n+\t\tusage(git_blame_usage);\n }\n \n static int git_blame_config(const char *var, const char *value, void *cb)\ndiff --git a/builtin-branch.c b/builtin-branch.c\nindex 9f57992..4ac81dd 100644\n--- a/builtin-branch.c\n+++ b/builtin-branch.c\n@@ -16,7 +16,7 @@\n #include \"diff.h\"\n #include \"revision.h\"\n \n-static const char * const builtin_branch_usage[] = {\n+static const char * const git_branch_usage[] = {\n \t\"git branch [options] [-r | -a] [--merged | --no-merged]\",\n \t\"git branch [options] [-l] [-f] <branchname> [<start-point>]\",\n \t\"git branch [options] [-r] (-d | -D) <branchname>\",\n@@ -622,10 +622,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n \t}\n \thashcpy(merge_filter_ref, head_sha1);\n \n-\targc = parse_options(argc, argv, prefix, options, builtin_branch_usage,\n+\targc = parse_options(argc, argv, prefix, options, git_branch_usage,\n \t\t\t     0);\n \tif (!!delete + !!rename + !!force_create > 1)\n-\t\tusage_with_options(builtin_branch_usage, options);\n+\t\tusage_with_options(git_branch_usage, options);\n \n \tif (delete)\n \t\treturn delete_branches(argc, argv, delete > 1, kinds);\n@@ -639,7 +639,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n \t\tcreate_branch(head, argv[0], (argc == 2) ? argv[1] : head,\n \t\t\t      force_create, reflog, track);\n \telse\n-\t\tusage_with_options(builtin_branch_usage, options);\n+\t\tusage_with_options(git_branch_usage, options);\n \n \treturn 0;\n }\ndiff --git a/builtin-bundle.c b/builtin-bundle.c\nindex 2006cc5..3d5d64e 100644\n--- a/builtin-bundle.c\n+++ b/builtin-bundle.c\n@@ -9,7 +9,7 @@\n  * bundle supporting \"fetch\", \"pull\", and \"ls-remote\".\n  */\n \n-static const char builtin_bundle_usage[] =\n+static const char git_bundle_usage[] =\n   \"git bundle create <file> <git-rev-list args>\\n\"\n   \"   or: git bundle verify <file>\\n\"\n   \"   or: git bundle list-heads <file> [refname...]\\n\"\n@@ -24,7 +24,7 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)\n \tchar buffer[PATH_MAX];\n \n \tif (argc < 3)\n-\t\tusage(builtin_bundle_usage);\n+\t\tusage(git_bundle_usage);\n \n \tcmd = argv[1];\n \tbundle_file = argv[2];\n@@ -63,5 +63,5 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)\n \t\treturn !!unbundle(&header, bundle_fd) ||\n \t\t\tlist_bundle_refs(&header, argc, argv);\n \t} else\n-\t\tusage(builtin_bundle_usage);\n+\t\tusage(git_bundle_usage);\n }\ndiff --git a/builtin-cat-file.c b/builtin-cat-file.c\nindex 5906842..c6b6779 100644\n--- a/builtin-cat-file.c\n+++ b/builtin-cat-file.c\n@@ -200,7 +200,7 @@ static int batch_objects(int print_contents)\n \treturn 0;\n }\n \n-static const char * const cat_file_usage[] = {\n+static const char * const git_cat_file_usage[] = {\n \t\"git cat-file (-t|-s|-e|-p|<type>) <object>\",\n \t\"git cat-file (--batch|--batch-check) < <list_of_objects>\",\n \tNULL\n@@ -229,25 +229,25 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)\n \tgit_config(git_default_config, NULL);\n \n \tif (argc != 3 && argc != 2)\n-\t\tusage_with_options(cat_file_usage, options);\n+\t\tusage_with_options(git_cat_file_usage, options);\n \n-\targc = parse_options(argc, argv, prefix, options, cat_file_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, git_cat_file_usage, 0);\n \n \tif (opt) {\n \t\tif (argc == 1)\n \t\t\tobj_name = argv[0];\n \t\telse\n-\t\t\tusage_with_options(cat_file_usage, options);\n+\t\t\tusage_with_options(git_cat_file_usage, options);\n \t}\n \tif (!opt && !batch) {\n \t\tif (argc == 2) {\n \t\t\texp_type = argv[0];\n \t\t\tobj_name = argv[1];\n \t\t} else\n-\t\t\tusage_with_options(cat_file_usage, options);\n+\t\t\tusage_with_options(git_cat_file_usage, options);\n \t}\n \tif (batch && (opt || argc)) {\n-\t\tusage_with_options(cat_file_usage, options);\n+\t\tusage_with_options(git_cat_file_usage, options);\n \t}\n \n \tif (batch)\ndiff --git a/builtin-check-attr.c b/builtin-check-attr.c\nindex 8bd0430..347f1fd 100644\n--- a/builtin-check-attr.c\n+++ b/builtin-check-attr.c\n@@ -5,7 +5,7 @@\n #include \"parse-options.h\"\n \n static int stdin_paths;\n-static const char * const check_attr_usage[] = {\n+static const char * const git_check_attr_usage[] = {\n \"git check-attr attr... [--] pathname...\",\n \"git check-attr --stdin attr... < <list-of-paths>\",\n NULL\n@@ -70,9 +70,9 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)\n \tconst char *errstr = NULL;\n \n \targc = parse_options(argc, argv, prefix, check_attr_options,\n-\t\t\t     check_attr_usage, PARSE_OPT_KEEP_DASHDASH);\n+\t\t\t     git_check_attr_usage, PARSE_OPT_KEEP_DASHDASH);\n \tif (!argc)\n-\t\tusage_with_options(check_attr_usage, check_attr_options);\n+\t\tusage_with_options(git_check_attr_usage, check_attr_options);\n \n \tif (read_cache() < 0) {\n \t\tdie(\"invalid cache\");\n@@ -98,7 +98,7 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)\n \t\terrstr = \"Can't specify files with --stdin\";\n \tif (errstr) {\n \t\terror(\"%s\", errstr);\n-\t\tusage_with_options(check_attr_usage, check_attr_options);\n+\t\tusage_with_options(git_check_attr_usage, check_attr_options);\n \t}\n \n \tcheck = xcalloc(cnt, sizeof(*check));\ndiff --git a/builtin-checkout-index.c b/builtin-checkout-index.c\nindex a7a5ee1..71fc0a4 100644\n--- a/builtin-checkout-index.c\n+++ b/builtin-checkout-index.c\n@@ -154,7 +154,7 @@ static void checkout_all(const char *prefix, int prefix_length)\n \t\texit(128);\n }\n \n-static const char * const builtin_checkout_index_usage[] = {\n+static const char * const git_checkout_index_usage[] = {\n \t\"git checkout-index [options] [--] <file>...\",\n \tNULL\n };\n@@ -250,7 +250,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)\n \t}\n \n \targc = parse_options(argc, argv, prefix, builtin_checkout_index_options,\n-\t\t\tbuiltin_checkout_index_usage, 0);\n+\t\t\tgit_checkout_index_usage, 0);\n \tstate.force = force;\n \tstate.quiet = quiet;\n \tstate.not_new = not_new;\ndiff --git a/builtin-checkout.c b/builtin-checkout.c\nindex d050c37..e93b8bb 100644\n--- a/builtin-checkout.c\n+++ b/builtin-checkout.c\n@@ -18,7 +18,7 @@\n #include \"xdiff-interface.h\"\n #include \"ll-merge.h\"\n \n-static const char * const checkout_usage[] = {\n+static const char * const git_checkout_usage[] = {\n \t\"git checkout [options] <branch>\",\n \t\"git checkout [options] [<branch>] -- <file>...\",\n \tNULL,\n@@ -608,7 +608,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \n \topts.track = BRANCH_TRACK_UNSPECIFIED;\n \n-\targc = parse_options(argc, argv, prefix, options, checkout_usage,\n+\targc = parse_options(argc, argv, prefix, options, git_checkout_usage,\n \t\t\t     PARSE_OPT_KEEP_DASHDASH);\n \n \tif (patch_mode && (opts.track > 0 || opts.new_branch\ndiff --git a/builtin-clean.c b/builtin-clean.c\nindex 28cdcd0..3f16b9a 100644\n--- a/builtin-clean.c\n+++ b/builtin-clean.c\n@@ -14,7 +14,7 @@\n \n static int force = -1; /* unset */\n \n-static const char *const builtin_clean_usage[] = {\n+static const char * const git_clean_usage[] = {\n \t\"git clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...\",\n \tNULL\n };\n@@ -56,7 +56,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)\n \telse\n \t\tconfig_set = 1;\n \n-\targc = parse_options(argc, argv, prefix, options, builtin_clean_usage,\n+\targc = parse_options(argc, argv, prefix, options, git_clean_usage,\n \t\t\t     0);\n \n \tmemset(&dir, 0, sizeof(dir));\ndiff --git a/builtin-clone.c b/builtin-clone.c\nindex bab2d84..31c54ca 100644\n--- a/builtin-clone.c\n+++ b/builtin-clone.c\n@@ -32,7 +32,7 @@\n  *  - dropping use-separate-remote and no-separate-remote compatibility\n  *\n  */\n-static const char * const builtin_clone_usage[] = {\n+static const char * const git_clone_usage[] = {\n \t\"git clone [options] [--] <repo> [<dir>]\",\n \tNULL\n };\n@@ -371,7 +371,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)\n \tjunk_pid = getpid();\n \n \targc = parse_options(argc, argv, prefix, builtin_clone_options,\n-\t\t\t     builtin_clone_usage, 0);\n+\t\t\t     git_clone_usage, 0);\n \n \tif (argc == 0)\n \t\tdie(\"You must specify a repository to clone.\");\ndiff --git a/builtin-commit-tree.c b/builtin-commit-tree.c\nindex 6467077..4d0e32b 100644\n--- a/builtin-commit-tree.c\n+++ b/builtin-commit-tree.c\n@@ -24,7 +24,8 @@ static void check_valid(unsigned char *sha1, enum object_type expect)\n \t\t    typename(expect));\n }\n \n-static const char commit_tree_usage[] = \"git commit-tree <sha1> [-p <sha1>]* < changelog\";\n+static const char git_commit_tree_usage[] =\n+\"git commit-tree <sha1> [-p <sha1>]* < changelog\";\n \n static void new_parent(struct commit *parent, struct commit_list **parents_p)\n {\n@@ -106,7 +107,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)\n \tgit_config(git_default_config, NULL);\n \n \tif (argc < 2)\n-\t\tusage(commit_tree_usage);\n+\t\tusage(git_commit_tree_usage);\n \tif (get_sha1(argv[1], tree_sha1))\n \t\tdie(\"Not a valid object name %s\", argv[1]);\n \n@@ -115,7 +116,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)\n \t\tconst char *a, *b;\n \t\ta = argv[i]; b = argv[i+1];\n \t\tif (!b || strcmp(a, \"-p\"))\n-\t\t\tusage(commit_tree_usage);\n+\t\t\tusage(git_commit_tree_usage);\n \n \t\tif (get_sha1(b, sha1))\n \t\t\tdie(\"Not a valid object name %s\", b);\ndiff --git a/builtin-commit.c b/builtin-commit.c\nindex 200ffda..2602257 100644\n--- a/builtin-commit.c\n+++ b/builtin-commit.c\n@@ -25,12 +25,12 @@\n #include \"rerere.h\"\n #include \"unpack-trees.h\"\n \n-static const char * const builtin_commit_usage[] = {\n+static const char * const git_commit_usage[] = {\n \t\"git commit [options] [--] <filepattern>...\",\n \tNULL\n };\n \n-static const char * const builtin_status_usage[] = {\n+static const char * const git_status_usage[] = {\n \t\"git status [options] [--] <filepattern>...\",\n \tNULL\n };\n@@ -897,7 +897,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)\n \tif (diff_use_color_default == -1)\n \t\tdiff_use_color_default = git_use_color_default;\n \n-\targc = parse_and_validate_options(argc, argv, builtin_status_usage,\n+\targc = parse_and_validate_options(argc, argv, git_status_usage,\n \t\t\t\t\t  prefix, &s);\n \treturn dry_run_commit(argc, argv, prefix, &s);\n }\n@@ -977,7 +977,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)\n \tif (s.use_color == -1)\n \t\ts.use_color = git_use_color_default;\n \n-\targc = parse_and_validate_options(argc, argv, builtin_commit_usage,\n+\targc = parse_and_validate_options(argc, argv, git_commit_usage,\n \t\t\t\t\t  prefix, &s);\n \tif (dry_run) {\n \t\tif (diff_use_color_default == -1)\ndiff --git a/builtin-config.c b/builtin-config.c\nindex a2d656e..ac59692 100644\n--- a/builtin-config.c\n+++ b/builtin-config.c\n@@ -3,7 +3,7 @@\n #include \"color.h\"\n #include \"parse-options.h\"\n \n-static const char *const builtin_config_usage[] = {\n+static const char * const git_config_usage[] = {\n \t\"git config [options]\",\n \tNULL\n };\n@@ -78,7 +78,7 @@ static void check_argc(int argc, int min, int max) {\n \tif (argc >= min && argc <= max)\n \t\treturn;\n \terror(\"wrong number of arguments\");\n-\tusage_with_options(builtin_config_usage, builtin_config_options);\n+\tusage_with_options(git_config_usage, builtin_config_options);\n }\n \n static int show_all_config(const char *key_, const char *value_, void *cb)\n@@ -317,12 +317,12 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix)\n \tconfig_exclusive_filename = getenv(CONFIG_ENVIRONMENT);\n \n \targc = parse_options(argc, argv, prefix, builtin_config_options,\n-\t\t\t     builtin_config_usage,\n+\t\t\t     git_config_usage,\n \t\t\t     PARSE_OPT_STOP_AT_NON_OPTION);\n \n \tif (use_global_config + use_system_config + !!given_config_file > 1) {\n \t\terror(\"only one config file at a time.\");\n-\t\tusage_with_options(builtin_config_usage, builtin_config_options);\n+\t\tusage_with_options(git_config_usage, builtin_config_options);\n \t}\n \n \tif (use_global_config) {\n@@ -353,7 +353,7 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix)\n \n \tif (HAS_MULTI_BITS(types)) {\n \t\terror(\"only one type at a time.\");\n-\t\tusage_with_options(builtin_config_usage, builtin_config_options);\n+\t\tusage_with_options(git_config_usage, builtin_config_options);\n \t}\n \n \tif (get_color_slot)\n@@ -363,12 +363,12 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix)\n \n \tif ((get_color_slot || get_colorbool_slot) && types) {\n \t\terror(\"--get-color and variable type are incoherent\");\n-\t\tusage_with_options(builtin_config_usage, builtin_config_options);\n+\t\tusage_with_options(git_config_usage, builtin_config_options);\n \t}\n \n \tif (HAS_MULTI_BITS(actions)) {\n \t\terror(\"only one action at a time.\");\n-\t\tusage_with_options(builtin_config_usage, builtin_config_options);\n+\t\tusage_with_options(git_config_usage, builtin_config_options);\n \t}\n \tif (actions == 0)\n \t\tswitch (argc) {\n@@ -376,7 +376,7 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix)\n \t\tcase 2: actions = ACTION_SET; break;\n \t\tcase 3: actions = ACTION_SET_ALL; break;\n \t\tdefault:\n-\t\t\tusage_with_options(builtin_config_usage, builtin_config_options);\n+\t\t\tusage_with_options(git_config_usage, builtin_config_options);\n \t\t}\n \n \tif (actions == ACTION_LIST) {\ndiff --git a/builtin-count-objects.c b/builtin-count-objects.c\nindex 1b0b6c8..9ed17b5 100644\n--- a/builtin-count-objects.c\n+++ b/builtin-count-objects.c\n@@ -65,7 +65,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,\n \t}\n }\n \n-static char const * const count_objects_usage[] = {\n+static const char * const git_count_objects_usage[] = {\n \t\"git count-objects [-v]\",\n \tNULL\n };\n@@ -83,10 +83,10 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)\n \t\tOPT_END(),\n \t};\n \n-\targc = parse_options(argc, argv, prefix, opts, count_objects_usage, 0);\n+\targc = parse_options(argc, argv, prefix, opts, git_count_objects_usage, 0);\n \t/* we do not take arguments other than flags for now */\n \tif (argc)\n-\t\tusage_with_options(count_objects_usage, opts);\n+\t\tusage_with_options(git_count_objects_usage, opts);\n \tmemcpy(path, objdir, len);\n \tif (len && objdir[len-1] != '/')\n \t\tpath[len++] = '/';\ndiff --git a/builtin-describe.c b/builtin-describe.c\nindex df67a73..50d2e6c 100644\n--- a/builtin-describe.c\n+++ b/builtin-describe.c\n@@ -9,7 +9,7 @@\n #define SEEN\t\t(1u<<0)\n #define MAX_TAGS\t(FLAG_BITS - 1)\n \n-static const char * const describe_usage[] = {\n+static const char * const git_describe_usage[] = {\n \t\"git describe [options] <committish>*\",\n \tNULL\n };\n@@ -327,7 +327,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)\n \t\tOPT_END(),\n \t};\n \n-\targc = parse_options(argc, argv, prefix, options, describe_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, git_describe_usage, 0);\n \tif (max_candidates < 0)\n \t\tmax_candidates = 0;\n \telse if (max_candidates > MAX_TAGS)\ndiff --git a/builtin-diff-files.c b/builtin-diff-files.c\nindex 5b64011..7acfb55 100644\n--- a/builtin-diff-files.c\n+++ b/builtin-diff-files.c\n@@ -9,7 +9,7 @@\n #include \"revision.h\"\n #include \"builtin.h\"\n \n-static const char diff_files_usage[] =\n+static const char git_diff_files_usage[] =\n \"git diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]\"\n COMMON_DIFF_OPTIONS_HELP;\n \n@@ -34,7 +34,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)\n \t\telse if (!strcmp(argv[1], \"-q\"))\n \t\t\toptions |= DIFF_SILENT_ON_REMOVED;\n \t\telse\n-\t\t\tusage(diff_files_usage);\n+\t\t\tusage(git_diff_files_usage);\n \t\targv++; argc--;\n \t}\n \tif (!rev.diffopt.output_format)\n@@ -48,7 +48,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)\n \tif (rev.pending.nr ||\n \t    rev.min_age != -1 || rev.max_age != -1 ||\n \t    3 < rev.max_count)\n-\t\tusage(diff_files_usage);\n+\t\tusage(git_diff_files_usage);\n \n \t/*\n \t * \"diff-files --base -p\" should not combine merges because it\ndiff --git a/builtin-diff-index.c b/builtin-diff-index.c\nindex 0483749..6e4e656 100644\n--- a/builtin-diff-index.c\n+++ b/builtin-diff-index.c\n@@ -4,7 +4,7 @@\n #include \"revision.h\"\n #include \"builtin.h\"\n \n-static const char diff_cache_usage[] =\n+static const char git_diff_index_usage[] =\n \"git diff-index [-m] [--cached] \"\n \"[<common diff options>] <tree-ish> [<path>...]\"\n COMMON_DIFF_OPTIONS_HELP;\n@@ -27,7 +27,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)\n \t\tif (!strcmp(arg, \"--cached\"))\n \t\t\tcached = 1;\n \t\telse\n-\t\t\tusage(diff_cache_usage);\n+\t\t\tusage(git_diff_index_usage);\n \t}\n \tif (!rev.diffopt.output_format)\n \t\trev.diffopt.output_format = DIFF_FORMAT_RAW;\n@@ -38,7 +38,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)\n \t */\n \tif (rev.pending.nr != 1 ||\n \t    rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)\n-\t\tusage(diff_cache_usage);\n+\t\tusage(git_diff_index_usage);\n \tif (!cached)\n \t\tsetup_work_tree();\n \tif (read_cache() < 0) {\ndiff --git a/builtin-diff-tree.c b/builtin-diff-tree.c\nindex 79cedb7..816b9a3 100644\n--- a/builtin-diff-tree.c\n+++ b/builtin-diff-tree.c\n@@ -85,7 +85,7 @@ static int diff_tree_stdin(char *line)\n \treturn -1;\n }\n \n-static const char diff_tree_usage[] =\n+static const char git_diff_tree_usage[] =\n \"git diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] \"\n \"[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\\n\"\n \"  -r            diff recursively\\n\"\n@@ -113,7 +113,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)\n \t\t\tread_stdin = 1;\n \t\t\tcontinue;\n \t\t}\n-\t\tusage(diff_tree_usage);\n+\t\tusage(git_diff_tree_usage);\n \t}\n \n \tif (!opt->diffopt.output_format)\n@@ -128,7 +128,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)\n \tswitch (nr_sha1) {\n \tcase 0:\n \t\tif (!read_stdin)\n-\t\t\tusage(diff_tree_usage);\n+\t\t\tusage(git_diff_tree_usage);\n \t\tbreak;\n \tcase 1:\n \t\ttree1 = opt->pending.objects[0].item;\ndiff --git a/builtin-diff.c b/builtin-diff.c\nindex ffcdd05..ae6e7e3 100644\n--- a/builtin-diff.c\n+++ b/builtin-diff.c\n@@ -20,7 +20,7 @@ struct blobinfo {\n \tunsigned mode;\n };\n \n-static const char builtin_diff_usage[] =\n+static const char git_diff_usage[] =\n \"git diff <options> <rev>{0,2} -- <path>*\";\n \n static void stuff_change(struct diff_options *opt,\n@@ -67,7 +67,7 @@ static int builtin_diff_b_f(struct rev_info *revs,\n \tstruct stat st;\n \n \tif (argc > 1)\n-\t\tusage(builtin_diff_usage);\n+\t\tusage(git_diff_usage);\n \n \tif (lstat(path, &st))\n \t\tdie_errno(\"failed to stat '%s'\", path);\n@@ -95,7 +95,7 @@ static int builtin_diff_blobs(struct rev_info *revs,\n \tunsigned mode = canon_mode(S_IFREG | 0644);\n \n \tif (argc > 1)\n-\t\tusage(builtin_diff_usage);\n+\t\tusage(git_diff_usage);\n \n \tif (blob[0].mode == S_IFINVALID)\n \t\tblob[0].mode = mode;\n@@ -121,7 +121,7 @@ static int builtin_diff_index(struct rev_info *revs,\n \t\tif (!strcmp(arg, \"--cached\") || !strcmp(arg, \"--staged\"))\n \t\t\tcached = 1;\n \t\telse\n-\t\t\tusage(builtin_diff_usage);\n+\t\t\tusage(git_diff_usage);\n \t\targv++; argc--;\n \t}\n \tif (!cached)\n@@ -133,7 +133,7 @@ static int builtin_diff_index(struct rev_info *revs,\n \tif (revs->pending.nr != 1 ||\n \t    revs->max_count != -1 || revs->min_age != -1 ||\n \t    revs->max_age != -1)\n-\t\tusage(builtin_diff_usage);\n+\t\tusage(git_diff_usage);\n \tif (read_cache_preload(revs->diffopt.paths) < 0) {\n \t\tperror(\"read_cache_preload\");\n \t\treturn -1;\n@@ -149,7 +149,7 @@ static int builtin_diff_tree(struct rev_info *revs,\n \tint swap = 0;\n \n \tif (argc > 1)\n-\t\tusage(builtin_diff_usage);\n+\t\tusage(git_diff_usage);\n \n \t/* We saw two trees, ent[0] and ent[1].\n \t * if ent[1] is uninteresting, they are swapped\n@@ -172,7 +172,7 @@ static int builtin_diff_combined(struct rev_info *revs,\n \tint i;\n \n \tif (argc > 1)\n-\t\tusage(builtin_diff_usage);\n+\t\tusage(git_diff_usage);\n \n \tif (!revs->dense_combined_merges && !revs->combine_merges)\n \t\trevs->dense_combined_merges = revs->combine_merges = 1;\n@@ -219,7 +219,7 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv\n \t\telse if (!strcmp(argv[1], \"-q\"))\n \t\t\toptions |= DIFF_SILENT_ON_REMOVED;\n \t\telse if (!strcmp(argv[1], \"-h\"))\n-\t\t\tusage(builtin_diff_usage);\n+\t\t\tusage(git_diff_usage);\n \t\telse\n \t\t\treturn error(\"invalid option: %s\", argv[1]);\n \t\targv++; argc--;\n@@ -389,20 +389,20 @@ int cmd_diff(int argc, const char **argv, const char *prefix)\n \t\t\tbreak;\n \t\tcase 1:\n \t\t\tif (paths != 1)\n-\t\t\t\tusage(builtin_diff_usage);\n+\t\t\t\tusage(git_diff_usage);\n \t\t\tresult = builtin_diff_b_f(&rev, argc, argv, blob, path);\n \t\t\tbreak;\n \t\tcase 2:\n \t\t\tif (paths)\n-\t\t\t\tusage(builtin_diff_usage);\n+\t\t\t\tusage(git_diff_usage);\n \t\t\tresult = builtin_diff_blobs(&rev, argc, argv, blob);\n \t\t\tbreak;\n \t\tdefault:\n-\t\t\tusage(builtin_diff_usage);\n+\t\t\tusage(git_diff_usage);\n \t\t}\n \t}\n \telse if (blobs)\n-\t\tusage(builtin_diff_usage);\n+\t\tusage(git_diff_usage);\n \telse if (ents == 1)\n \t\tresult = builtin_diff_index(&rev, argc, argv);\n \telse if (ents == 2)\ndiff --git a/builtin-fast-export.c b/builtin-fast-export.c\nindex b0a4029..cf751a9 100644\n--- a/builtin-fast-export.c\n+++ b/builtin-fast-export.c\n@@ -17,7 +17,7 @@\n #include \"utf8.h\"\n #include \"parse-options.h\"\n \n-static const char *fast_export_usage[] = {\n+static const char * const git_fast_export_usage[] = {\n \t\"git fast-export [rev-list-opts]\",\n \tNULL\n };\n@@ -591,7 +591,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)\n \t};\n \n \tif (argc == 1)\n-\t\tusage_with_options (fast_export_usage, options);\n+\t\tusage_with_options(git_fast_export_usage, options);\n \n \t/* we handle encodings */\n \tgit_config(git_default_config, NULL);\n@@ -601,9 +601,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)\n \trevs.show_source = 1;\n \trevs.rewrite_parents = 1;\n \targc = setup_revisions(argc, argv, &revs, NULL);\n-\targc = parse_options(argc, argv, prefix, options, fast_export_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, git_fast_export_usage, 0);\n \tif (argc > 1)\n-\t\tusage_with_options (fast_export_usage, options);\n+\t\tusage_with_options(git_fast_export_usage, options);\n \n \tif (import_filename)\n \t\timport_marks(import_filename);\ndiff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c\nindex 629735f..5c546f9 100644\n--- a/builtin-fetch-pack.c\n+++ b/builtin-fetch-pack.c\n@@ -18,7 +18,7 @@ static struct fetch_pack_args args = {\n \t/* .uploadpack = */ \"git-upload-pack\",\n };\n \n-static const char fetch_pack_usage[] =\n+static const char git_fetch_pack_usage[] =\n \"git fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>...]\";\n \n #define COMPLETE\t(1U << 0)\n@@ -734,7 +734,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)\n \t\t\t\targs.no_progress = 1;\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\tusage(fetch_pack_usage);\n+\t\t\tusage(git_fetch_pack_usage);\n \t\t}\n \t\tdest = (char *)arg;\n \t\theads = (char **)(argv + i + 1);\n@@ -742,7 +742,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)\n \t\tbreak;\n \t}\n \tif (!dest)\n-\t\tusage(fetch_pack_usage);\n+\t\tusage(git_fetch_pack_usage);\n \n \tconn = git_connect(fd, (char *)dest, args.uploadpack,\n \t\t\t   args.verbose ? CONNECT_VERBOSE : 0);\ndiff --git a/builtin-fetch.c b/builtin-fetch.c\nindex cb48c57..42d2ffc 100644\n--- a/builtin-fetch.c\n+++ b/builtin-fetch.c\n@@ -12,7 +12,7 @@\n #include \"parse-options.h\"\n #include \"sigchain.h\"\n \n-static const char * const builtin_fetch_usage[] = {\n+static const char * const git_fetch_usage[] = {\n \t\"git fetch [options] [<repository> <refspec>...]\",\n \tNULL\n };\n@@ -653,7 +653,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)\n \t\tstrbuf_addf(&default_rla, \" %s\", argv[i]);\n \n \targc = parse_options(argc, argv, prefix,\n-\t\t\t     builtin_fetch_options, builtin_fetch_usage, 0);\n+\t\t\t     builtin_fetch_options, git_fetch_usage, 0);\n \n \tif (argc == 0)\n \t\tremote = remote_get(NULL);\ndiff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\nindex 9d52400..1b375e9 100644\n--- a/builtin-fmt-merge-msg.c\n+++ b/builtin-fmt-merge-msg.c\n@@ -5,7 +5,7 @@\n #include \"revision.h\"\n #include \"tag.h\"\n \n-static const char * const fmt_merge_msg_usage[] = {\n+static const char * const git_fmt_merge_msg_usage[] = {\n \t\"git fmt-merge-msg [--log|--no-log] [--file <file>]\",\n \tNULL\n };\n@@ -360,10 +360,10 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n \tint ret;\n \n \tgit_config(fmt_merge_msg_config, NULL);\n-\targc = parse_options(argc, argv, prefix, options, fmt_merge_msg_usage,\n+\targc = parse_options(argc, argv, prefix, options, git_fmt_merge_msg_usage,\n \t\t\t     0);\n \tif (argc > 0)\n-\t\tusage_with_options(fmt_merge_msg_usage, options);\n+\t\tusage_with_options(git_fmt_merge_msg_usage, options);\n \n \tif (inpath && strcmp(inpath, \"-\")) {\n \t\tin = fopen(inpath, \"r\");\ndiff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c\nindex a5a83f1..37e3c38 100644\n--- a/builtin-for-each-ref.c\n+++ b/builtin-for-each-ref.c\n@@ -881,7 +881,7 @@ static int opt_parse_sort(const struct option *opt, const char *arg, int unset)\n \treturn 0;\n }\n \n-static char const * const for_each_ref_usage[] = {\n+static const char * const git_for_each_ref_usage[] = {\n \t\"git for-each-ref [options] [<pattern>]\",\n \tNULL\n };\n@@ -913,17 +913,17 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \t\tOPT_END(),\n \t};\n \n-\tparse_options(argc, argv, prefix, opts, for_each_ref_usage, 0);\n+\tparse_options(argc, argv, prefix, opts, git_for_each_ref_usage, 0);\n \tif (maxcount < 0) {\n \t\terror(\"invalid --count argument: `%d'\", maxcount);\n-\t\tusage_with_options(for_each_ref_usage, opts);\n+\t\tusage_with_options(git_for_each_ref_usage, opts);\n \t}\n \tif (HAS_MULTI_BITS(quote_style)) {\n \t\terror(\"more than one quoting style?\");\n-\t\tusage_with_options(for_each_ref_usage, opts);\n+\t\tusage_with_options(git_for_each_ref_usage, opts);\n \t}\n \tif (verify_format(format))\n-\t\tusage_with_options(for_each_ref_usage, opts);\n+\t\tusage_with_options(git_for_each_ref_usage, opts);\n \n \tif (!sort)\n \t\tsort = default_sort();\ndiff --git a/builtin-fsck.c b/builtin-fsck.c\nindex c58b0e3..76da573 100644\n--- a/builtin-fsck.c\n+++ b/builtin-fsck.c\n@@ -564,7 +564,7 @@ static int fsck_cache_tree(struct cache_tree *it)\n \treturn err;\n }\n \n-static char const * const fsck_usage[] = {\n+static const char * const git_fsck_usage[] = {\n \t\"git fsck [options] [<object>...]\",\n \tNULL\n };\n@@ -591,7 +591,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)\n \terrors_found = 0;\n \tread_replace_refs = 0;\n \n-\targc = parse_options(argc, argv, prefix, fsck_opts, fsck_usage, 0);\n+\targc = parse_options(argc, argv, prefix, fsck_opts, git_fsck_usage, 0);\n \tif (write_lost_and_found) {\n \t\tcheck_full = 1;\n \t\tinclude_reflogs = 0;\ndiff --git a/builtin-gc.c b/builtin-gc.c\nindex 7d3e9cc..ecacd1c 100644\n--- a/builtin-gc.c\n+++ b/builtin-gc.c\n@@ -17,7 +17,7 @@\n \n #define FAILED_RUN \"failed to run %s\"\n \n-static const char * const builtin_gc_usage[] = {\n+static const char * const git_gc_usage[] = {\n \t\"git gc [options]\",\n \tNULL\n };\n@@ -195,9 +195,9 @@ int cmd_gc(int argc, const char **argv, const char *prefix)\n \t\tpack_refs = !is_bare_repository();\n \n \targc = parse_options(argc, argv, prefix, builtin_gc_options,\n-\t\t\t     builtin_gc_usage, 0);\n+\t\t\t     git_gc_usage, 0);\n \tif (argc > 0)\n-\t\tusage_with_options(builtin_gc_usage, builtin_gc_options);\n+\t\tusage_with_options(git_gc_usage, builtin_gc_options);\n \n \tif (aggressive) {\n \t\tappend_option(argv_repack, \"-f\", MAX_ADD);\ndiff --git a/builtin-grep.c b/builtin-grep.c\nindex 761799d..0517440 100644\n--- a/builtin-grep.c\n+++ b/builtin-grep.c\n@@ -23,7 +23,7 @@\n #endif\n #endif\n \n-static char const * const grep_usage[] = {\n+static const char * const git_grep_usage[] = {\n \t\"git grep [options] [-e] <pattern> [<rev>...] [[--] path...]\",\n \tNULL\n };\n@@ -813,7 +813,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)\n \t * unrecognized non option is the beginning of the refs list\n \t * that continues up to the -- (if exists), and then paths.\n \t */\n-\targc = parse_options(argc, argv, prefix, options, grep_usage,\n+\targc = parse_options(argc, argv, prefix, options, git_grep_usage,\n \t\t\t     PARSE_OPT_KEEP_DASHDASH |\n \t\t\t     PARSE_OPT_STOP_AT_NON_OPTION |\n \t\t\t     PARSE_OPT_NO_INTERNAL_HELP);\ndiff --git a/builtin-help.c b/builtin-help.c\nindex e1eba77..bf9b5fb 100644\n--- a/builtin-help.c\n+++ b/builtin-help.c\n@@ -40,7 +40,7 @@ static struct option builtin_help_options[] = {\n \tOPT_END(),\n };\n \n-static const char * const builtin_help_usage[] = {\n+static const char * const git_help_usage[] = {\n \t\"git help [--all] [--man|--web|--info] [command]\",\n \tNULL\n };\n@@ -420,7 +420,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)\n \tgit_config(git_help_config, NULL);\n \n \targc = parse_options(argc, argv, prefix, builtin_help_options,\n-\t\t\tbuiltin_help_usage, 0);\n+\t\t\tgit_help_usage, 0);\n \n \tif (show_all) {\n \t\tprintf(\"usage: %s\\n\\n\", git_usage_string);\ndiff --git a/builtin-init-db.c b/builtin-init-db.c\nindex dd84cae..25448d2 100644\n--- a/builtin-init-db.c\n+++ b/builtin-init-db.c\n@@ -377,7 +377,7 @@ static int shared_callback(const struct option *opt, const char *arg, int unset)\n \treturn 0;\n }\n \n-static const char *const init_db_usage[] = {\n+static const char * const git_init_db_usage[] = {\n \t\"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]] [directory]\",\n \tNULL\n };\n@@ -406,7 +406,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)\n \t\tOPT_END()\n \t};\n \n-\targc = parse_options(argc, argv, prefix, init_db_options, init_db_usage, 0);\n+\targc = parse_options(argc, argv, prefix, init_db_options, git_init_db_usage, 0);\n \n \tif (argc == 1) {\n \t\tint mkdir_tried = 0;\n@@ -440,7 +440,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)\n \t\t\tdie_errno(\"cannot chdir to %s\", argv[0]);\n \t\t}\n \t} else if (0 < argc) {\n-\t\tusage(init_db_usage[0]);\n+\t\tusage(git_init_db_usage[0]);\n \t}\n \tif (is_bare_repository_cfg == 1) {\n \t\tstatic char git_dir[PATH_MAX+1];\ndiff --git a/builtin-log.c b/builtin-log.c\nindex 25e21ed..5d17d65 100644\n--- a/builtin-log.c\n+++ b/builtin-log.c\n@@ -27,9 +27,9 @@ static int default_show_root = 1;\n static const char *fmt_patch_subject_prefix = \"PATCH\";\n static const char *fmt_pretty;\n \n-static const char * const builtin_log_usage =\n-\t\"git log [<options>] [<since>..<until>] [[--] <path>...]\\n\"\n-\t\"   or: git show [options] <object>...\";\n+static const char * const git_log_usage =\n+\"git log [<options>] [<since>..<until>] [[--] <path>...]\\n\"\n+\"   or: git show [options] <object>...\";\n \n static void cmd_log_init(int argc, const char **argv, const char *prefix,\n \t\t      struct rev_info *rev)\n@@ -74,7 +74,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,\n \t\t} else if (!strcmp(arg, \"--source\")) {\n \t\t\trev->show_source = 1;\n \t\t} else if (!strcmp(arg, \"-h\")) {\n-\t\t\tusage(builtin_log_usage);\n+\t\t\tusage(git_log_usage);\n \t\t} else\n \t\t\tdie(\"unrecognized argument: %s\", arg);\n \t}\n@@ -769,7 +769,7 @@ static const char *set_outdir(const char *prefix, const char *output_directory)\n \t\t\t\t       output_directory));\n }\n \n-static const char * const builtin_format_patch_usage[] = {\n+static const char * const git_format_patch_usage[] = {\n \t\"git format-patch [options] [<since> | <revision range>]\",\n \tNULL\n };\n@@ -965,7 +965,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)\n \t * possibly a valid SHA1.\n \t */\n \targc = parse_options(argc, argv, prefix, builtin_format_patch_options,\n-\t\t\t     builtin_format_patch_usage,\n+\t\t\t     git_format_patch_usage,\n \t\t\t     PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN);\n \n \tif (do_signoff) {\n@@ -1217,7 +1217,7 @@ static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)\n \treturn -1;\n }\n \n-static const char cherry_usage[] =\n+static const char git_cherry_usage[] =\n \"git cherry [-v] [<upstream> [<head> [<limit>]]]\";\n int cmd_cherry(int argc, const char **argv, const char *prefix)\n {\n@@ -1255,7 +1255,7 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)\n \t\t\tfprintf(stderr, \"Could not find a tracked\"\n \t\t\t\t\t\" remote branch, please\"\n \t\t\t\t\t\" specify <upstream> manually.\\n\");\n-\t\t\tusage(cherry_usage);\n+\t\t\tusage(git_cherry_usage);\n \t\t}\n \n \t\tupstream = current_branch->merge[0]->dst;\ndiff --git a/builtin-ls-files.c b/builtin-ls-files.c\nindex f473220..781cf3d 100644\n--- a/builtin-ls-files.c\n+++ b/builtin-ls-files.c\n@@ -373,7 +373,7 @@ int report_path_error(const char *ps_matched, const char **pathspec, int prefix_\n \treturn errors;\n }\n \n-static const char * const ls_files_usage[] = {\n+static const char * const git_ls_files_usage[] = {\n \t\"git ls-files [options] [<file>]*\",\n \tNULL\n };\n@@ -482,7 +482,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)\n \tgit_config(git_default_config, NULL);\n \n \targc = parse_options(argc, argv, prefix, builtin_ls_files_options,\n-\t\t\tls_files_usage, 0);\n+\t\t\tgit_ls_files_usage, 0);\n \tif (show_tag || show_valid_bit) {\n \t\ttag_cached = \"H \";\n \t\ttag_unmerged = \"M \";\ndiff --git a/builtin-ls-remote.c b/builtin-ls-remote.c\nindex 78a88f7..bc257b4 100644\n--- a/builtin-ls-remote.c\n+++ b/builtin-ls-remote.c\n@@ -3,7 +3,7 @@\n #include \"transport.h\"\n #include \"remote.h\"\n \n-static const char ls_remote_usage[] =\n+static const char git_ls_remote_usage[] =\n \"git ls-remote [--heads] [--tags]  [-u <exec> | --upload-pack <exec>] <repository> <refs>...\";\n \n /*\n@@ -66,7 +66,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)\n \t\t\t\tflags |= REF_NORMAL;\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\tusage(ls_remote_usage);\n+\t\t\tusage(git_ls_remote_usage);\n \t\t}\n \t\tdest = arg;\n \t\ti++;\n@@ -74,7 +74,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)\n \t}\n \n \tif (!dest)\n-\t\tusage(ls_remote_usage);\n+\t\tusage(git_ls_remote_usage);\n \n \tif (argv[i]) {\n \t\tint j;\ndiff --git a/builtin-ls-tree.c b/builtin-ls-tree.c\nindex 22008df..d701ca0 100644\n--- a/builtin-ls-tree.c\n+++ b/builtin-ls-tree.c\n@@ -22,8 +22,8 @@ static const char **pathspec;\n static int chomp_prefix;\n static const char *ls_tree_prefix;\n \n-static const char ls_tree_usage[] =\n-\t\"git ls-tree [-d] [-r] [-t] [-l] [-z] [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]] <tree-ish> [path...]\";\n+static const char git_ls_tree_usage[] =\n+\"git ls-tree [-d] [-r] [-t] [-l] [-z] [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]] <tree-ish> [path...]\";\n \n static int show_recursive(const char *base, int baselen, const char *pathname)\n {\n@@ -172,7 +172,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)\n \t\t\t}\n \t\t\t/* otherwise fallthru */\n \t\tdefault:\n-\t\t\tusage(ls_tree_usage);\n+\t\t\tusage(git_ls_tree_usage);\n \t\t}\n \t\targc--; argv++;\n \t}\n@@ -182,7 +182,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)\n \t\tls_options |= LS_SHOW_TREES;\n \n \tif (argc < 2)\n-\t\tusage(ls_tree_usage);\n+\t\tusage(git_ls_tree_usage);\n \tif (get_sha1(argv[1], sha1))\n \t\tdie(\"Not a valid object name %s\", argv[1]);\n \ndiff --git a/builtin-mailinfo.c b/builtin-mailinfo.c\nindex d498b1c..2349c95 100644\n--- a/builtin-mailinfo.c\n+++ b/builtin-mailinfo.c\n@@ -1003,8 +1003,8 @@ static int git_mailinfo_config(const char *var, const char *value, void *unused)\n \treturn 0;\n }\n \n-static const char mailinfo_usage[] =\n-\t\"git mailinfo [-k] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info\";\n+static const char git_mailinfo_usage[] =\n+\"git mailinfo [-k] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info\";\n \n int cmd_mailinfo(int argc, const char **argv, const char *prefix)\n {\n@@ -1032,12 +1032,12 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)\n \t\telse if (!strcmp(argv[1], \"--no-scissors\"))\n \t\t\tuse_scissors = 0;\n \t\telse\n-\t\t\tusage(mailinfo_usage);\n+\t\t\tusage(git_mailinfo_usage);\n \t\targc--; argv++;\n \t}\n \n \tif (argc != 3)\n-\t\tusage(mailinfo_usage);\n+\t\tusage(git_mailinfo_usage);\n \n \treturn !!mailinfo(stdin, stdout, argv[1], argv[2]);\n }\ndiff --git a/builtin-merge-base.c b/builtin-merge-base.c\nindex 54e7ec2..8b9dd4d 100644\n--- a/builtin-merge-base.c\n+++ b/builtin-merge-base.c\n@@ -22,7 +22,7 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)\n \treturn 0;\n }\n \n-static const char * const merge_base_usage[] = {\n+static const char * const git_merge_base_usage[] = {\n \t\"git merge-base [-a|--all] <commit> <commit>...\",\n \tNULL\n };\n@@ -53,9 +53,9 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)\n \t};\n \n \tgit_config(git_default_config, NULL);\n-\targc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, git_merge_base_usage, 0);\n \tif (argc < 2)\n-\t\tusage_with_options(merge_base_usage, options);\n+\t\tusage_with_options(git_merge_base_usage, options);\n \trev = xmalloc(argc * sizeof(*rev));\n \twhile (argc-- > 0)\n \t\trev[rev_nr++] = get_commit_reference(*argv++);\ndiff --git a/builtin-merge-file.c b/builtin-merge-file.c\nindex afd2ea7..381946c 100644\n--- a/builtin-merge-file.c\n+++ b/builtin-merge-file.c\n@@ -4,7 +4,7 @@\n #include \"xdiff-interface.h\"\n #include \"parse-options.h\"\n \n-static const char *const merge_file_usage[] = {\n+static const char * const git_merge_file_usage[] = {\n \t\"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2\",\n \tNULL\n };\n@@ -48,9 +48,9 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)\n \t\t\tmerge_style = git_xmerge_style;\n \t}\n \n-\targc = parse_options(argc, argv, prefix, options, merge_file_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, git_merge_file_usage, 0);\n \tif (argc != 3)\n-\t\tusage_with_options(merge_file_usage, options);\n+\t\tusage_with_options(git_merge_file_usage, options);\n \tif (quiet) {\n \t\tif (!freopen(\"/dev/null\", \"w\", stderr))\n \t\t\treturn error(\"failed to redirect stderr to /dev/null: \"\ndiff --git a/builtin-merge.c b/builtin-merge.c\nindex b6b8428..44129fa 100644\n--- a/builtin-merge.c\n+++ b/builtin-merge.c\n@@ -35,7 +35,7 @@ struct strategy {\n \tunsigned attr;\n };\n \n-static const char * const builtin_merge_usage[] = {\n+static const char * const git_merge_usage[] = {\n \t\"git merge [options] <remote>...\",\n \t\"git merge [options] <msg> HEAD <remote>\",\n \tNULL\n@@ -467,7 +467,7 @@ static int git_merge_config(const char *k, const char *v, void *cb)\n \t\tmemmove(argv + 1, argv, sizeof(*argv) * (argc + 1));\n \t\targc++;\n \t\tparse_options(argc, argv, NULL, builtin_merge_options,\n-\t\t\t      builtin_merge_usage, 0);\n+\t\t\t      git_merge_usage, 0);\n \t\tfree(buf);\n \t}\n \n@@ -864,7 +864,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)\n \t\tdiff_use_color_default = git_use_color_default;\n \n \targc = parse_options(argc, argv, prefix, builtin_merge_options,\n-\t\t\tbuiltin_merge_usage, 0);\n+\t\t\tgit_merge_usage, 0);\n \tif (verbosity < 0)\n \t\tshow_diffstat = 0;\n \n@@ -875,7 +875,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)\n \t}\n \n \tif (!argc)\n-\t\tusage_with_options(builtin_merge_usage,\n+\t\tusage_with_options(git_merge_usage,\n \t\t\tbuiltin_merge_options);\n \n \t/*\n@@ -936,7 +936,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)\n \t}\n \n \tif (head_invalid || !argc)\n-\t\tusage_with_options(builtin_merge_usage,\n+\t\tusage_with_options(git_merge_usage,\n \t\t\tbuiltin_merge_options);\n \n \tstrbuf_addstr(&buf, \"merge\");\ndiff --git a/builtin-mktree.c b/builtin-mktree.c\nindex 098395f..ff3b0f7 100644\n--- a/builtin-mktree.c\n+++ b/builtin-mktree.c\n@@ -62,7 +62,7 @@ static void write_tree(unsigned char *sha1)\n \twrite_sha1_file(buf.buf, buf.len, tree_type, sha1);\n }\n \n-static const char *mktree_usage[] = {\n+static const char * const git_mktree_usage[] = {\n \t\"git mktree [-z] [--missing] [--batch]\",\n \tNULL\n };\n@@ -139,7 +139,7 @@ static void mktree_line(char *buf, size_t len, int line_termination, int allow_m\n \tappend_to_tree(mode, sha1, path);\n }\n \n-int cmd_mktree(int ac, const char **av, const char *prefix)\n+int cmd_mktree(int argc, const char **argv, const char *prefix)\n {\n \tstruct strbuf sb = STRBUF_INIT;\n \tunsigned char sha1[20];\n@@ -155,7 +155,7 @@ int cmd_mktree(int ac, const char **av, const char *prefix)\n \t\tOPT_END()\n \t};\n \n-\tac = parse_options(ac, av, prefix, option, mktree_usage, 0);\n+\targc = parse_options(argc, argv, prefix, option, git_mktree_usage, 0);\n \n \twhile (!got_eof) {\n \t\twhile (1) {\ndiff --git a/builtin-mv.c b/builtin-mv.c\nindex 1b20028..b5879bd 100644\n--- a/builtin-mv.c\n+++ b/builtin-mv.c\n@@ -10,7 +10,7 @@\n #include \"string-list.h\"\n #include \"parse-options.h\"\n \n-static const char * const builtin_mv_usage[] = {\n+static const char * const git_mv_usage[] = {\n \t\"git mv [options] <source>... <destination>\",\n \tNULL\n };\n@@ -69,9 +69,9 @@ int cmd_mv(int argc, const char **argv, const char *prefix)\n \t\tdie(\"index file corrupt\");\n \n \targc = parse_options(argc, argv, prefix, builtin_mv_options,\n-\t\t\t     builtin_mv_usage, 0);\n+\t\t\t     git_mv_usage, 0);\n \tif (--argc < 1)\n-\t\tusage_with_options(builtin_mv_usage, builtin_mv_options);\n+\t\tusage_with_options(git_mv_usage, builtin_mv_options);\n \n \tsource = copy_pathspec(prefix, argv, argc, 0);\n \tmodes = xcalloc(argc, sizeof(enum update_mode));\n@@ -86,7 +86,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)\n \t\tdestination = copy_pathspec(dest_path[0], argv, argc, 1);\n \t} else {\n \t\tif (argc != 1)\n-\t\t\tusage_with_options(builtin_mv_usage, builtin_mv_options);\n+\t\t\tusage_with_options(git_mv_usage, builtin_mv_options);\n \t\tdestination = dest_path;\n \t}\n \ndiff --git a/builtin-name-rev.c b/builtin-name-rev.c\nindex 06a38ac..e5e9e1b 100644\n--- a/builtin-name-rev.c\n+++ b/builtin-name-rev.c\n@@ -171,7 +171,7 @@ static void show_name(const struct object *obj,\n \t\tdie(\"cannot describe '%s'\", sha1_to_hex(sha1));\n }\n \n-static char const * const name_rev_usage[] = {\n+static const char * const git_name_rev_usage[] = {\n \t\"git name-rev [options] ( --all | --stdin | <commit>... )\",\n \tNULL\n };\n@@ -238,10 +238,10 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)\n \t};\n \n \tgit_config(git_default_config, NULL);\n-\targc = parse_options(argc, argv, prefix, opts, name_rev_usage, 0);\n+\targc = parse_options(argc, argv, prefix, opts, git_name_rev_usage, 0);\n \tif (!!all + !!transform_stdin + !!argc > 1) {\n \t\terror(\"Specify either a list, or --all, not both!\");\n-\t\tusage_with_options(name_rev_usage, opts);\n+\t\tusage_with_options(git_name_rev_usage, opts);\n \t}\n \tif (all || transform_stdin)\n \t\tcutoff = 0;\ndiff --git a/builtin-pack-objects.c b/builtin-pack-objects.c\nindex 02f9246..3f7a630 100644\n--- a/builtin-pack-objects.c\n+++ b/builtin-pack-objects.c\n@@ -22,7 +22,7 @@\n #include <pthread.h>\n #endif\n \n-static const char pack_usage[] =\n+static const char git_pack_objects_usage[] =\n   \"git pack-objects [{ -q | --progress | --all-progress }]\\n\"\n   \"        [--max-pack-size=N] [--local] [--incremental]\\n\"\n   \"        [--window=N] [--window-memory=N] [--depth=N]\\n\"\n@@ -2166,7 +2166,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)\n \t\t\tchar *end;\n \t\t\tint level = strtoul(arg+14, &end, 0);\n \t\t\tif (!arg[14] || *end)\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(git_pack_objects_usage);\n \t\t\tif (level == -1)\n \t\t\t\tlevel = Z_DEFAULT_COMPRESSION;\n \t\t\telse if (level < 0 || level > Z_BEST_COMPRESSION)\n@@ -2179,26 +2179,26 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)\n \t\t\tpack_size_limit_cfg = 0;\n \t\t\tpack_size_limit = strtoul(arg+16, &end, 0) * 1024 * 1024;\n \t\t\tif (!arg[16] || *end)\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(git_pack_objects_usage);\n \t\t\tcontinue;\n \t\t}\n \t\tif (!prefixcmp(arg, \"--window=\")) {\n \t\t\tchar *end;\n \t\t\twindow = strtoul(arg+9, &end, 0);\n \t\t\tif (!arg[9] || *end)\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(git_pack_objects_usage);\n \t\t\tcontinue;\n \t\t}\n \t\tif (!prefixcmp(arg, \"--window-memory=\")) {\n \t\t\tif (!git_parse_ulong(arg+16, &window_memory_limit))\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(git_pack_objects_usage);\n \t\t\tcontinue;\n \t\t}\n \t\tif (!prefixcmp(arg, \"--threads=\")) {\n \t\t\tchar *end;\n \t\t\tdelta_search_threads = strtoul(arg+10, &end, 0);\n \t\t\tif (!arg[10] || *end || delta_search_threads < 0)\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(git_pack_objects_usage);\n #ifndef THREADED_DELTA_SEARCH\n \t\t\tif (delta_search_threads != 1)\n \t\t\t\twarning(\"no threads support, \"\n@@ -2210,7 +2210,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)\n \t\t\tchar *end;\n \t\t\tdepth = strtoul(arg+8, &end, 0);\n \t\t\tif (!arg[8] || *end)\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(git_pack_objects_usage);\n \t\t\tcontinue;\n \t\t}\n \t\tif (!strcmp(\"--progress\", arg)) {\n@@ -2290,7 +2290,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)\n \t\t\tgrafts_replace_parents = 0;\n \t\t\tcontinue;\n \t\t}\n-\t\tusage(pack_usage);\n+\t\tusage(git_pack_objects_usage);\n \t}\n \n \t/* Traditionally \"pack-objects [options] base extra\" failed;\n@@ -2310,7 +2310,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)\n \t\tbase_name = argv[i++];\n \n \tif (pack_to_stdout != !base_name)\n-\t\tusage(pack_usage);\n+\t\tusage(git_pack_objects_usage);\n \n \tif (!pack_to_stdout && !pack_size_limit)\n \t\tpack_size_limit = pack_size_limit_cfg;\ndiff --git a/builtin-pack-refs.c b/builtin-pack-refs.c\nindex 091860b..32f59fb 100644\n--- a/builtin-pack-refs.c\n+++ b/builtin-pack-refs.c\n@@ -2,7 +2,7 @@\n #include \"parse-options.h\"\n #include \"pack-refs.h\"\n \n-static char const * const pack_refs_usage[] = {\n+static const char * const git_pack_refs_usage[] = {\n \t\"git pack-refs [options]\",\n \tNULL\n };\n@@ -15,7 +15,7 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)\n \t\tOPT_BIT(0, \"prune\", &flags, \"prune loose refs (default)\", PACK_REFS_PRUNE),\n \t\tOPT_END(),\n \t};\n-\tif (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0))\n-\t\tusage_with_options(pack_refs_usage, opts);\n+\tif (parse_options(argc, argv, prefix, opts, git_pack_refs_usage, 0))\n+\t\tusage_with_options(git_pack_refs_usage, opts);\n \treturn pack_refs(flags);\n }\ndiff --git a/builtin-prune-packed.c b/builtin-prune-packed.c\nindex be99eb0..ffb1cdd 100644\n--- a/builtin-prune-packed.c\n+++ b/builtin-prune-packed.c\n@@ -3,7 +3,7 @@\n #include \"progress.h\"\n #include \"parse-options.h\"\n \n-static const char * const prune_packed_usage[] = {\n+static const char * const git_prune_packed_usage[] = {\n \t\"git prune-packed [-n|--dry-run] [-q|--quiet]\",\n \tNULL\n };\n@@ -79,7 +79,7 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)\n \t};\n \n \targc = parse_options(argc, argv, prefix, prune_packed_options,\n-\t\t\t     prune_packed_usage, 0);\n+\t\t\t     git_prune_packed_usage, 0);\n \n \tprune_packed_objects(opts);\n \treturn 0;\ndiff --git a/builtin-prune.c b/builtin-prune.c\nindex 8459aec..a983689 100644\n--- a/builtin-prune.c\n+++ b/builtin-prune.c\n@@ -7,7 +7,7 @@\n #include \"parse-options.h\"\n #include \"dir.h\"\n \n-static const char * const prune_usage[] = {\n+static const char * const git_prune_usage[] = {\n \t\"git prune [-n] [-v] [--expire <time>] [--] [<head>...]\",\n \tNULL\n };\n@@ -143,7 +143,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)\n \tread_replace_refs = 0;\n \tinit_revisions(&revs, prefix);\n \n-\targc = parse_options(argc, argv, prefix, options, prune_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, git_prune_usage, 0);\n \twhile (argc--) {\n \t\tunsigned char sha1[20];\n \t\tconst char *name = *argv++;\ndiff --git a/builtin-push.c b/builtin-push.c\nindex 3cb1ee4..7b7817c 100644\n--- a/builtin-push.c\n+++ b/builtin-push.c\n@@ -9,7 +9,7 @@\n #include \"transport.h\"\n #include \"parse-options.h\"\n \n-static const char * const push_usage[] = {\n+static const char * const git_push_usage[] = {\n \t\"git push [--all | --mirror] [-n | --dry-run] [--porcelain] [--tags] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [-v] [<repository> <refspec>...]\",\n \tNULL,\n };\n@@ -191,7 +191,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)\n \t\tOPT_END()\n \t};\n \n-\targc = parse_options(argc, argv, prefix, options, push_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, git_push_usage, 0);\n \n \tif (tags)\n \t\tadd_refspec(\"refs/tags/*\");\n@@ -203,7 +203,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)\n \n \trc = do_push(repo, flags);\n \tif (rc == -1)\n-\t\tusage_with_options(push_usage, options);\n+\t\tusage_with_options(git_push_usage, options);\n \telse\n \t\treturn rc;\n }\ndiff --git a/builtin-read-tree.c b/builtin-read-tree.c\nindex 14c836b..c7edeea 100644\n--- a/builtin-read-tree.c\n+++ b/builtin-read-tree.c\n@@ -30,7 +30,7 @@ static int list_tree(unsigned char *sha1)\n \treturn 0;\n }\n \n-static const char * const read_tree_usage[] = {\n+static const char * const git_read_tree_usage[] = {\n \t\"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]]  [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]]\",\n \tNULL\n };\n@@ -111,7 +111,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)\n \tnewfd = hold_locked_index(&lock_file, 1);\n \n \targc = parse_options(argc, argv, unused_prefix, read_tree_options,\n-\t\t\t     read_tree_usage, 0);\n+\t\t\t     git_read_tree_usage, 0);\n \n \tprefix_set = opts.prefix ? 1 : 0;\n \tif (1 < opts.merge + opts.reset + prefix_set)\ndiff --git a/builtin-receive-pack.c b/builtin-receive-pack.c\nindex b771fe9..1c2146a 100644\n--- a/builtin-receive-pack.c\n+++ b/builtin-receive-pack.c\n@@ -9,7 +9,7 @@\n #include \"remote.h\"\n #include \"transport.h\"\n \n-static const char receive_pack_usage[] = \"git receive-pack <git-dir>\";\n+static const char git_receive_pack_usage[] = \"git receive-pack <git-dir>\";\n \n enum deny_action {\n \tDENY_UNCONFIGURED,\n@@ -624,14 +624,14 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)\n \n \t\tif (*arg == '-') {\n \t\t\t/* Do flag handling here */\n-\t\t\tusage(receive_pack_usage);\n+\t\t\tusage(git_receive_pack_usage);\n \t\t}\n \t\tif (dir)\n-\t\t\tusage(receive_pack_usage);\n+\t\t\tusage(git_receive_pack_usage);\n \t\tdir = xstrdup(arg);\n \t}\n \tif (!dir)\n-\t\tusage(receive_pack_usage);\n+\t\tusage(git_receive_pack_usage);\n \n \tsetup_path();\n \ndiff --git a/builtin-reflog.c b/builtin-reflog.c\nindex e23b5ef..a1d8674 100644\n--- a/builtin-reflog.c\n+++ b/builtin-reflog.c\n@@ -693,7 +693,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)\n  * main \"reflog\"\n  */\n \n-static const char reflog_usage[] =\n+static const char git_reflog_usage[] =\n \"git reflog [ show | expire | delete ]\";\n \n int cmd_reflog(int argc, const char **argv, const char *prefix)\n@@ -712,5 +712,5 @@ int cmd_reflog(int argc, const char **argv, const char *prefix)\n \t\treturn cmd_reflog_delete(argc - 1, argv + 1, prefix);\n \n \t/* Not a recognized reflog command..*/\n-\tusage(reflog_usage);\n+\tusage(git_reflog_usage);\n }\ndiff --git a/builtin-remote.c b/builtin-remote.c\nindex 0777dd7..4e6a02c 100644\n--- a/builtin-remote.c\n+++ b/builtin-remote.c\n@@ -7,7 +7,7 @@\n #include \"run-command.h\"\n #include \"refs.h\"\n \n-static const char * const builtin_remote_usage[] = {\n+static const char * const git_remote_usage[] = {\n \t\"git remote [-v | --verbose]\",\n \t\"git remote add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>\",\n \t\"git remote rename <old> <new>\",\n@@ -79,11 +79,11 @@ static int add(int argc, const char **argv)\n \t\tOPT_END()\n \t};\n \n-\targc = parse_options(argc, argv, NULL, options, builtin_remote_usage,\n+\targc = parse_options(argc, argv, NULL, options, git_remote_usage,\n \t\t\t     0);\n \n \tif (argc < 2)\n-\t\tusage_with_options(builtin_remote_usage, options);\n+\t\tusage_with_options(git_remote_usage, options);\n \n \tname = argv[0];\n \turl = argv[1];\n@@ -540,7 +540,7 @@ static int mv(int argc, const char **argv)\n \tint i;\n \n \tif (argc != 3)\n-\t\tusage_with_options(builtin_remote_usage, options);\n+\t\tusage_with_options(git_remote_usage, options);\n \n \trename.old = argv[1];\n \trename.new = argv[2];\n@@ -681,7 +681,7 @@ static int rm(int argc, const char **argv)\n \tint i, result;\n \n \tif (argc != 2)\n-\t\tusage_with_options(builtin_remote_usage, options);\n+\t\tusage_with_options(git_remote_usage, options);\n \n \tremote = remote_get(argv[1]);\n \tif (!remote)\n@@ -984,7 +984,7 @@ static int show(int argc, const char **argv)\n \tstruct string_list info_list = { NULL, 0, 0, 0 };\n \tstruct show_info info;\n \n-\targc = parse_options(argc, argv, NULL, options, builtin_remote_usage,\n+\targc = parse_options(argc, argv, NULL, options, git_remote_usage,\n \t\t\t     0);\n \n \tif (argc < 1)\n@@ -1088,7 +1088,7 @@ static int set_head(int argc, const char **argv)\n \t\t\t    \"delete refs/remotes/<name>/HEAD\"),\n \t\tOPT_END()\n \t};\n-\targc = parse_options(argc, argv, NULL, options, builtin_remote_usage,\n+\targc = parse_options(argc, argv, NULL, options, git_remote_usage,\n \t\t\t     0);\n \tif (argc)\n \t\tstrbuf_addf(&buf, \"refs/remotes/%s/HEAD\", argv[0]);\n@@ -1114,7 +1114,7 @@ static int set_head(int argc, const char **argv)\n \t\tif (delete_ref(buf.buf, NULL, REF_NODEREF))\n \t\t\tresult |= error(\"Could not delete %s\", buf.buf);\n \t} else\n-\t\tusage_with_options(builtin_remote_usage, options);\n+\t\tusage_with_options(git_remote_usage, options);\n \n \tif (head_name) {\n \t\tunsigned char sha1[20];\n@@ -1143,11 +1143,11 @@ static int prune(int argc, const char **argv)\n \t\tOPT_END()\n \t};\n \n-\targc = parse_options(argc, argv, NULL, options, builtin_remote_usage,\n+\targc = parse_options(argc, argv, NULL, options, git_remote_usage,\n \t\t\t     0);\n \n \tif (argc < 1)\n-\t\tusage_with_options(builtin_remote_usage, options);\n+\t\tusage_with_options(git_remote_usage, options);\n \n \tfor (; argc; argc--, argv++)\n \t\tresult |= prune_remote(*argv, dry_run);\n@@ -1234,7 +1234,7 @@ static int update(int argc, const char **argv)\n \t\tOPT_END()\n \t};\n \n-\targc = parse_options(argc, argv, NULL, options, builtin_remote_usage,\n+\targc = parse_options(argc, argv, NULL, options, git_remote_usage,\n \t\t\t     PARSE_OPT_KEEP_ARGV0);\n \tif (argc < 2) {\n \t\targc = 2;\n@@ -1339,7 +1339,7 @@ int cmd_remote(int argc, const char **argv, const char *prefix)\n \t};\n \tint result;\n \n-\targc = parse_options(argc, argv, prefix, options, builtin_remote_usage,\n+\targc = parse_options(argc, argv, prefix, options, git_remote_usage,\n \t\tPARSE_OPT_STOP_AT_NON_OPTION);\n \n \tif (argc < 1)\n@@ -1360,7 +1360,7 @@ int cmd_remote(int argc, const char **argv, const char *prefix)\n \t\tresult = update(argc, argv);\n \telse {\n \t\terror(\"Unknown subcommand: %s\", argv[0]);\n-\t\tusage_with_options(builtin_remote_usage, options);\n+\t\tusage_with_options(git_remote_usage, options);\n \t}\n \n \treturn result ? 1 : 0;\ndiff --git a/builtin-rev-list.c b/builtin-rev-list.c\nindex 4ba1c12..adfc2a5 100644\n--- a/builtin-rev-list.c\n+++ b/builtin-rev-list.c\n@@ -8,7 +8,7 @@\n #include \"graph.h\"\n #include \"bisect.h\"\n \n-static const char rev_list_usage[] =\n+static const char git_rev_list_usage[] =\n \"git rev-list [OPTION] <commit-id>... [ -- paths... ]\\n\"\n \"  limiting output:\\n\"\n \"    --max-count=nr\\n\"\n@@ -354,7 +354,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)\n \t\t\tread_revisions_from_stdin(&revs);\n \t\t\tcontinue;\n \t\t}\n-\t\tusage(rev_list_usage);\n+\t\tusage(git_rev_list_usage);\n \n \t}\n \tif (revs.commit_format != CMIT_FMT_UNSPECIFIED) {\n@@ -373,7 +373,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)\n \t     (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&\n \t      !revs.pending.nr)) ||\n \t    revs.diff)\n-\t\tusage(rev_list_usage);\n+\t\tusage(git_rev_list_usage);\n \n \tsave_commit_buffer = revs.verbose_header ||\n \t\trevs.grep_filter.pattern_list;\ndiff --git a/builtin-rev-parse.c b/builtin-rev-parse.c\nindex 45bead6..c91b056 100644\n--- a/builtin-rev-parse.c\n+++ b/builtin-rev-parse.c\n@@ -302,7 +302,7 @@ static const char *skipspaces(const char *s)\n static int cmd_parseopt(int argc, const char **argv, const char *prefix)\n {\n \tstatic int keep_dashdash = 0, stop_at_non_option = 0;\n-\tstatic char const * const parseopt_usage[] = {\n+\tstatic const char * const parseopt_usage[] = {\n \t\t\"git rev-parse --parseopt [options] -- [<args>...]\",\n \t\tNULL\n \t};\ndiff --git a/builtin-revert.c b/builtin-revert.c\nindex 151aa6a..750255f 100644\n--- a/builtin-revert.c\n+++ b/builtin-revert.c\n@@ -25,12 +25,12 @@\n  * Copyright (c) 2005 Junio C Hamano\n  */\n \n-static const char * const revert_usage[] = {\n+static const char * const git_revert_usage[] = {\n \t\"git revert [options] <commit-ish>\",\n \tNULL\n };\n \n-static const char * const cherry_pick_usage[] = {\n+static const char * const git_cherry_pick_usage[] = {\n \t\"git cherry-pick [options] <commit-ish>\",\n \tNULL\n };\n@@ -46,7 +46,7 @@ static const char *me;\n static void parse_args(int argc, const char **argv)\n {\n \tconst char * const * usage_str =\n-\t\taction == REVERT ?  revert_usage : cherry_pick_usage;\n+\t\taction == REVERT ?  git_revert_usage : git_cherry_pick_usage;\n \tunsigned char sha1[20];\n \tconst char *arg;\n \tint noop;\ndiff --git a/builtin-rm.c b/builtin-rm.c\nindex 57975db..861981d 100644\n--- a/builtin-rm.c\n+++ b/builtin-rm.c\n@@ -10,7 +10,7 @@\n #include \"tree-walk.h\"\n #include \"parse-options.h\"\n \n-static const char * const builtin_rm_usage[] = {\n+static const char * const git_rm_usage[] = {\n \t\"git rm [options] [--] <file>...\",\n \tNULL\n };\n@@ -158,9 +158,9 @@ int cmd_rm(int argc, const char **argv, const char *prefix)\n \tgit_config(git_default_config, NULL);\n \n \targc = parse_options(argc, argv, prefix, builtin_rm_options,\n-\t\t\t     builtin_rm_usage, 0);\n+\t\t\t     git_rm_usage, 0);\n \tif (!argc)\n-\t\tusage_with_options(builtin_rm_usage, builtin_rm_options);\n+\t\tusage_with_options(git_rm_usage, builtin_rm_options);\n \n \tif (!index_only)\n \t\tsetup_work_tree();\ndiff --git a/builtin-send-pack.c b/builtin-send-pack.c\nindex 37e528e..b77ae1d 100644\n--- a/builtin-send-pack.c\n+++ b/builtin-send-pack.c\n@@ -6,7 +6,7 @@\n #include \"remote.h\"\n #include \"send-pack.h\"\n \n-static const char send_pack_usage[] =\n+static const char git_send_pack_usage[] =\n \"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\\n\"\n \"  --all and explicit <ref> specification are mutually exclusive.\";\n \n@@ -523,7 +523,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)\n \t\t\t\targs.use_thin_pack = 1;\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\tusage(send_pack_usage);\n+\t\t\tusage(git_send_pack_usage);\n \t\t}\n \t\tif (!dest) {\n \t\t\tdest = arg;\n@@ -534,14 +534,14 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)\n \t\tbreak;\n \t}\n \tif (!dest)\n-\t\tusage(send_pack_usage);\n+\t\tusage(git_send_pack_usage);\n \t/*\n \t * --all and --mirror are incompatible; neither makes sense\n \t * with any refspecs.\n \t */\n \tif ((refspecs && (send_all || args.send_mirror)) ||\n \t    (send_all && args.send_mirror))\n-\t\tusage(send_pack_usage);\n+\t\tusage(git_send_pack_usage);\n \n \tif (remote_name) {\n \t\tremote = remote_get(remote_name);\ndiff --git a/builtin-shortlog.c b/builtin-shortlog.c\nindex 4d4a3c8..a342535 100644\n--- a/builtin-shortlog.c\n+++ b/builtin-shortlog.c\n@@ -9,7 +9,7 @@\n #include \"shortlog.h\"\n #include \"parse-options.h\"\n \n-static char const * const shortlog_usage[] = {\n+static const char * const git_shortlog_usage[] = {\n \t\"git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]\",\n \t\"\",\n \t\"[rev-opts] are documented in git-rev-list(1)\",\n@@ -267,20 +267,20 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)\n \t\t\t    PARSE_OPT_KEEP_ARGV0);\n \n \tfor (;;) {\n-\t\tswitch (parse_options_step(&ctx, options, shortlog_usage)) {\n+\t\tswitch (parse_options_step(&ctx, options, git_shortlog_usage)) {\n \t\tcase PARSE_OPT_HELP:\n \t\t\texit(129);\n \t\tcase PARSE_OPT_DONE:\n \t\t\tgoto parse_done;\n \t\t}\n-\t\tparse_revision_opt(&rev, &ctx, options, shortlog_usage);\n+\t\tparse_revision_opt(&rev, &ctx, options, git_shortlog_usage);\n \t}\n parse_done:\n \targc = parse_options_end(&ctx);\n \n \tif (setup_revisions(argc, argv, &rev, NULL) != 1) {\n \t\terror(\"unrecognized argument: %s\", argv[1]);\n-\t\tusage_with_options(shortlog_usage, options);\n+\t\tusage_with_options(git_shortlog_usage, options);\n \t}\n \n \tlog.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;\ndiff --git a/builtin-show-branch.c b/builtin-show-branch.c\nindex 3510a86..6aaa949 100644\n--- a/builtin-show-branch.c\n+++ b/builtin-show-branch.c\n@@ -5,7 +5,7 @@\n #include \"color.h\"\n #include \"parse-options.h\"\n \n-static const char* show_branch_usage[] = {\n+static const char * const git_show_branch_usage[] = {\n     \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [<rev> | <glob>]...\",\n     \"git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\",\n     NULL\n@@ -697,7 +697,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)\n \t}\n \n \tac = parse_options(ac, av, prefix, builtin_show_branch_options,\n-\t\t\t   show_branch_usage, PARSE_OPT_STOP_AT_NON_OPTION);\n+\t\t\t   git_show_branch_usage, PARSE_OPT_STOP_AT_NON_OPTION);\n \tif (all_heads)\n \t\tall_remotes = 1;\n \n@@ -706,7 +706,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)\n \t\t * independent nor merge-base modes.\n \t\t */\n \t\tif (independent || merge_base)\n-\t\t\tusage_with_options(show_branch_usage,\n+\t\t\tusage_with_options(git_show_branch_usage,\n \t\t\t\t\t   builtin_show_branch_options);\n \t\tif (reflog && ((0 < extra) || all_heads || all_remotes))\n \t\t\t/*\ndiff --git a/builtin-show-ref.c b/builtin-show-ref.c\nindex c46550c..1d53216 100644\n--- a/builtin-show-ref.c\n+++ b/builtin-show-ref.c\n@@ -6,7 +6,7 @@\n #include \"string-list.h\"\n #include \"parse-options.h\"\n \n-static const char * const show_ref_usage[] = {\n+static const char * const git_show_ref_usage[] = {\n \t\"git show-ref [-q|--quiet] [--verify] [-h|--head] [-d|--dereference] [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] \",\n \t\"git show-ref --exclude-existing[=pattern] < ref-list\",\n \tNULL\n@@ -202,7 +202,7 @@ static const struct option show_ref_options[] = {\n int cmd_show_ref(int argc, const char **argv, const char *prefix)\n {\n \targc = parse_options(argc, argv, prefix, show_ref_options,\n-\t\t\t     show_ref_usage, PARSE_OPT_NO_INTERNAL_HELP);\n+\t\t\t     git_show_ref_usage, PARSE_OPT_NO_INTERNAL_HELP);\n \n \tif (exclude_arg)\n \t\treturn exclude_existing(exclude_existing_arg);\ndiff --git a/builtin-tar-tree.c b/builtin-tar-tree.c\nindex 8b3a35e..c34ab77 100644\n--- a/builtin-tar-tree.c\n+++ b/builtin-tar-tree.c\n@@ -7,7 +7,7 @@\n #include \"builtin.h\"\n #include \"quote.h\"\n \n-static const char tar_tree_usage[] =\n+static const char git_tar_tree_usage[] =\n \"git tar-tree [--remote=<repo>] <tree-ish> [basedir]\\n\"\n \"*** Note that this command is now deprecated; use \\\"git archive\\\" instead.\";\n \n@@ -45,7 +45,7 @@ int cmd_tar_tree(int argc, const char **argv, const char *prefix)\n \n \tswitch (argc) {\n \tdefault:\n-\t\tusage(tar_tree_usage);\n+\t\tusage(git_tar_tree_usage);\n \t\tbreak;\n \tcase 3:\n \t\t/* base-path */\ndiff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c\nindex 685566e..d7b1b8b 100644\n--- a/builtin-unpack-objects.c\n+++ b/builtin-unpack-objects.c\n@@ -13,7 +13,8 @@\n #include \"fsck.h\"\n \n static int dry_run, quiet, recover, has_errors, strict;\n-static const char unpack_usage[] = \"git unpack-objects [-n] [-q] [-r] [--strict] < pack-file\";\n+static const char git_unpack_usage[] =\n+\"git unpack-objects [-n] [-q] [-r] [--strict] < pack-file\";\n \n /* We always read in 4kB chunks. */\n static unsigned char buffer[4096];\n@@ -538,11 +539,11 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix)\n \t\t\t\tlen = sizeof(*hdr);\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\tusage(unpack_usage);\n+\t\t\tusage(git_unpack_usage);\n \t\t}\n \n \t\t/* We don't take any non-flag arguments now.. Maybe some day */\n-\t\tusage(unpack_usage);\n+\t\tusage(git_unpack_usage);\n \t}\n \tgit_SHA1_Init(&ctx);\n \tunpack_all();\ndiff --git a/builtin-update-index.c b/builtin-update-index.c\nindex 92beaaf..1a3716e 100644\n--- a/builtin-update-index.c\n+++ b/builtin-update-index.c\n@@ -387,7 +387,7 @@ static void read_index_info(int line_termination)\n \tstrbuf_release(&uq);\n }\n \n-static const char update_index_usage[] =\n+static const char git_update_index_usage[] =\n \"git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] <file>...\";\n \n static unsigned char head_sha1[20];\n@@ -703,7 +703,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t\tif (!strcmp(path, \"-h\") || !strcmp(path, \"--help\"))\n-\t\t\t\tusage(update_index_usage);\n+\t\t\t\tusage(git_update_index_usage);\n \t\t\tdie(\"unknown option %s\", path);\n \t\t}\n \t\tsetup_work_tree();\ndiff --git a/builtin-update-server-info.c b/builtin-update-server-info.c\nindex 2b3fddc..12ea6f4 100644\n--- a/builtin-update-server-info.c\n+++ b/builtin-update-server-info.c\n@@ -2,7 +2,7 @@\n #include \"builtin.h\"\n #include \"parse-options.h\"\n \n-static const char * const update_server_info_usage[] = {\n+static const char * const git_update_server_info_usage[] = {\n \t\"git update-server-info [--force]\",\n \tNULL\n };\n@@ -17,9 +17,9 @@ int cmd_update_server_info(int argc, const char **argv, const char *prefix)\n \t};\n \n \targc = parse_options(argc, argv, prefix, options,\n-\t\t\t     update_server_info_usage, 0);\n+\t\t\t     git_update_server_info_usage, 0);\n \tif (argc > 0)\n-\t\tusage_with_options(update_server_info_usage, options);\n+\t\tusage_with_options(git_update_server_info_usage, options);\n \n \treturn !!update_server_info(force);\n }\ndiff --git a/builtin-upload-archive.c b/builtin-upload-archive.c\nindex c4cd1e1..e24e7c6 100644\n--- a/builtin-upload-archive.c\n+++ b/builtin-upload-archive.c\n@@ -7,8 +7,7 @@\n #include \"pkt-line.h\"\n #include \"sideband.h\"\n \n-static const char upload_archive_usage[] =\n-\t\"git upload-archive <repo>\";\n+static const char git_upload_archive_usage[] = \"git upload-archive <repo>\";\n \n static const char deadchild[] =\n \"git upload-archive: archiver died with error\";\n@@ -27,7 +26,7 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix)\n \tint len;\n \n \tif (argc != 2)\n-\t\tusage(upload_archive_usage);\n+\t\tusage(git_upload_archive_usage);\n \n \tif (strlen(argv[1]) + 1 > sizeof(buf))\n \t\tdie(\"insanely long repository name\");\ndiff --git a/builtin-verify-pack.c b/builtin-verify-pack.c\nindex b6079ae..6a380fa 100644\n--- a/builtin-verify-pack.c\n+++ b/builtin-verify-pack.c\n@@ -133,7 +133,7 @@ static int verify_one_pack(const char *path, unsigned int flags)\n \treturn err;\n }\n \n-static const char * const verify_pack_usage[] = {\n+static const char * const git_verify_pack_usage[] = {\n \t\"git verify-pack [-v|--verbose] [-s|--stat-only] <pack>...\",\n \tNULL\n };\n@@ -153,9 +153,9 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)\n \n \tgit_config(git_default_config, NULL);\n \targc = parse_options(argc, argv, prefix, verify_pack_options,\n-\t\t\t     verify_pack_usage, 0);\n+\t\t\t     git_verify_pack_usage, 0);\n \tif (argc < 1)\n-\t\tusage_with_options(verify_pack_usage, verify_pack_options);\n+\t\tusage_with_options(git_verify_pack_usage, verify_pack_options);\n \tfor (i = 0; i < argc; i++) {\n \t\tif (verify_one_pack(argv[i], flags))\n \t\t\terr = 1;\ndiff --git a/builtin-verify-tag.c b/builtin-verify-tag.c\nindex 9f482c2..0fd981d 100644\n--- a/builtin-verify-tag.c\n+++ b/builtin-verify-tag.c\n@@ -12,7 +12,7 @@\n #include <signal.h>\n #include \"parse-options.h\"\n \n-static const char * const verify_tag_usage[] = {\n+static const char * const git_verify_tag_usage[] = {\n \t\t\"git verify-tag [-v|--verbose] <tag>...\",\n \t\tNULL\n };\n@@ -100,9 +100,9 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)\n \tgit_config(git_default_config, NULL);\n \n \targc = parse_options(argc, argv, prefix, verify_tag_options,\n-\t\t\t     verify_tag_usage, PARSE_OPT_KEEP_ARGV0);\n+\t\t\t     git_verify_tag_usage, PARSE_OPT_KEEP_ARGV0);\n \tif (argc <= i)\n-\t\tusage_with_options(verify_tag_usage, verify_tag_options);\n+\t\tusage_with_options(git_verify_tag_usage, verify_tag_options);\n \n \t/* sometimes the program was terminated because this signal\n \t * was received in the process of writing the gpg input: */\ndiff --git a/builtin-write-tree.c b/builtin-write-tree.c\nindex b223af4..6456c86 100644\n--- a/builtin-write-tree.c\n+++ b/builtin-write-tree.c\n@@ -9,7 +9,7 @@\n #include \"cache-tree.h\"\n #include \"parse-options.h\"\n \n-static const char * const write_tree_usage[] = {\n+static const char * const git_write_tree_usage[] = {\n \t\"git write-tree [--missing-ok] [--prefix=<prefix>/]\",\n \tNULL\n };\n@@ -35,7 +35,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)\n \n \tgit_config(git_default_config, NULL);\n \targc = parse_options(argc, argv, unused_prefix, write_tree_options,\n-\t\t\t     write_tree_usage, 0);\n+\t\t\t     git_write_tree_usage, 0);\n \n \tret = write_cache_as_tree(sha1, flags, prefix);\n \tswitch (ret) {\ndiff --git a/daemon.c b/daemon.c\nindex 1b5ada6..8cf8f6d 100644\n--- a/daemon.c\n+++ b/daemon.c\n@@ -18,7 +18,7 @@ static int log_syslog;\n static int verbose;\n static int reuseaddr;\n \n-static const char daemon_usage[] =\n+static const char git_daemon_usage[] =\n \"git daemon [--verbose] [--syslog] [--export-all]\\n\"\n \"           [--timeout=n] [--init-timeout=n] [--max-connections=n]\\n\"\n \"           [--strict-paths] [--base-path=path] [--base-path-relaxed]\\n\"\n@@ -1097,7 +1097,7 @@ int main(int argc, char **argv)\n \t\t\tbreak;\n \t\t}\n \n-\t\tusage(daemon_usage);\n+\t\tusage(git_daemon_usage);\n \t}\n \n \tif (log_syslog) {\ndiff --git a/fast-import.c b/fast-import.c\nindex 7ef9865..c04b4d4 100644\n--- a/fast-import.c\n+++ b/fast-import.c\n@@ -2393,7 +2393,7 @@ static int git_pack_config(const char *k, const char *v, void *cb)\n \treturn git_default_config(k, v, cb);\n }\n \n-static const char fast_import_usage[] =\n+static const char git_fast_import_usage[] =\n \"git fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]\";\n \n int main(int argc, const char **argv)\n@@ -2459,7 +2459,7 @@ int main(int argc, const char **argv)\n \t\t\tdie(\"unknown option %s\", a);\n \t}\n \tif (i != argc)\n-\t\tusage(fast_import_usage);\n+\t\tusage(git_fast_import_usage);\n \n \trc_free = pool_alloc(cmd_save * sizeof(*rc_free));\n \tfor (i = 0; i < (cmd_save - 1); i++)\ndiff --git a/hash-object.c b/hash-object.c\nindex 9455dd0..5f3e39c 100644\n--- a/hash-object.c\n+++ b/hash-object.c\n@@ -50,7 +50,7 @@ static void hash_stdin_paths(const char *type, int write_objects)\n \tstrbuf_release(&nbuf);\n }\n \n-static const char * const hash_object_usage[] = {\n+static const char * const git_hash_object_usage[] = {\n \t\"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] <file>...\",\n \t\"git hash-object  --stdin-paths < <list-of-paths>\",\n \tNULL\n@@ -85,7 +85,7 @@ int main(int argc, const char **argv)\n \tgit_extract_argv0_path(argv[0]);\n \n \targc = parse_options(argc, argv, NULL, hash_object_options,\n-\t\t\t     hash_object_usage, 0);\n+\t\t\t     git_hash_object_usage, 0);\n \n \tif (write_object) {\n \t\tprefix = setup_git_directory();\n@@ -115,7 +115,7 @@ int main(int argc, const char **argv)\n \n \tif (errstr) {\n \t\terror(\"%s\", errstr);\n-\t\tusage_with_options(hash_object_usage, hash_object_options);\n+\t\tusage_with_options(git_hash_object_usage, hash_object_options);\n \t}\n \n \tif (hashstdin)\ndiff --git a/http-push.c b/http-push.c\nindex 00e83dc..473b8ee 100644\n--- a/http-push.c\n+++ b/http-push.c\n@@ -13,7 +13,7 @@\n \n #include <expat.h>\n \n-static const char http_push_usage[] =\n+static const char git_http_push_usage[] =\n \"git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\\n\";\n \n #ifndef XML_STATUS_OK\n@@ -1849,7 +1849,7 @@ int main(int argc, char **argv)\n #endif\n \n \tif (!repo->url)\n-\t\tusage(http_push_usage);\n+\t\tusage(git_http_push_usage);\n \n \tif (delete_branch && nr_refspec != 1)\n \t\tdie(\"You must specify only one branch name when deleting a remote branch\");\ndiff --git a/index-pack.c b/index-pack.c\nindex 340074f..344b2f2 100644\n--- a/index-pack.c\n+++ b/index-pack.c\n@@ -10,7 +10,7 @@\n #include \"fsck.h\"\n #include \"exec_cmd.h\"\n \n-static const char index_pack_usage[] =\n+static const char git_index_pack_usage[] =\n \"git index-pack [-v] [-o <index-file>] [{ ---keep | --keep=<msg> }] [--strict] { <pack-file> | --stdin [--fix-thin] [<pack-file>] }\";\n \n struct object_entry\n@@ -933,7 +933,7 @@ int main(int argc, char **argv)\n \t\t\t\tverbose = 1;\n \t\t\t} else if (!strcmp(arg, \"-o\")) {\n \t\t\t\tif (index_name || (i+1) >= argc)\n-\t\t\t\t\tusage(index_pack_usage);\n+\t\t\t\t\tusage(git_index_pack_usage);\n \t\t\t\tindex_name = argv[++i];\n \t\t\t} else if (!prefixcmp(arg, \"--index-version=\")) {\n \t\t\t\tchar *c;\n@@ -945,17 +945,17 @@ int main(int argc, char **argv)\n \t\t\t\tif (*c || pack_idx_off32_limit & 0x80000000)\n \t\t\t\t\tdie(\"bad %s\", arg);\n \t\t\t} else\n-\t\t\t\tusage(index_pack_usage);\n+\t\t\t\tusage(git_index_pack_usage);\n \t\t\tcontinue;\n \t\t}\n \n \t\tif (pack_name)\n-\t\t\tusage(index_pack_usage);\n+\t\t\tusage(git_index_pack_usage);\n \t\tpack_name = arg;\n \t}\n \n \tif (!pack_name && !from_stdin)\n-\t\tusage(index_pack_usage);\n+\t\tusage(git_index_pack_usage);\n \tif (fix_thin_pack && !from_stdin)\n \t\tdie(\"--fix-thin cannot be used without --stdin\");\n \tif (!index_name && pack_name) {\ndiff --git a/merge-tree.c b/merge-tree.c\nindex f01e7c8..3a430b8 100644\n--- a/merge-tree.c\n+++ b/merge-tree.c\n@@ -4,7 +4,9 @@\n #include \"blob.h\"\n #include \"exec_cmd.h\"\n \n-static const char merge_tree_usage[] = \"git merge-tree <base-tree> <branch1> <branch2>\";\n+static const char git_merge_tree_usage[] =\n+\"git merge-tree <base-tree> <branch1> <branch2>\";\n+\n static int resolve_directories = 1;\n \n struct merge_list {\n@@ -343,7 +345,7 @@ int main(int argc, char **argv)\n \tvoid *buf1, *buf2, *buf3;\n \n \tif (argc != 4)\n-\t\tusage(merge_tree_usage);\n+\t\tusage(git_merge_tree_usage);\n \n \tgit_extract_argv0_path(argv[0]);\n \ndiff --git a/pack-redundant.c b/pack-redundant.c\nindex 69a7ab2..9cb096d 100644\n--- a/pack-redundant.c\n+++ b/pack-redundant.c\n@@ -11,7 +11,7 @@\n \n #define BLKSIZE 512\n \n-static const char pack_redundant_usage[] =\n+static const char git_pack_redundant_usage[] =\n \"git pack-redundant [ --verbose ] [ --alt-odb ] < --all | <.pack filename> ...>\";\n \n static int load_all_packs, verbose, alt_odb;\n@@ -624,7 +624,7 @@ int main(int argc, char **argv)\n \t\t\tcontinue;\n \t\t}\n \t\tif (*arg == '-')\n-\t\t\tusage(pack_redundant_usage);\n+\t\t\tusage(git_pack_redundant_usage);\n \t\telse\n \t\t\tbreak;\n \t}\ndiff --git a/patch-id.c b/patch-id.c\nindex 0df4cb0..46ee1b2 100644\n--- a/patch-id.c\n+++ b/patch-id.c\n@@ -73,12 +73,12 @@ static void generate_id_list(void)\n \tflush_current_id(patchlen, sha1, &ctx);\n }\n \n-static const char patch_id_usage[] = \"git patch-id < patch\";\n+static const char git_patch_id_usage[] = \"git patch-id < patch\";\n \n int main(int argc, char **argv)\n {\n \tif (argc != 1)\n-\t\tusage(patch_id_usage);\n+\t\tusage(git_patch_id_usage);\n \n \tgit_extract_argv0_path(argv[0]);\n \ndiff --git a/upload-pack.c b/upload-pack.c\nindex 38ddac2..82ed0d2 100644\n--- a/upload-pack.c\n+++ b/upload-pack.c\n@@ -11,7 +11,8 @@\n #include \"list-objects.h\"\n #include \"run-command.h\"\n \n-static const char upload_pack_usage[] = \"git upload-pack [--strict] [--timeout=nn] <dir>\";\n+static const char git_upload_pack_usage[] =\n+\"git upload-pack [--strict] [--timeout=nn] <dir>\";\n \n /* bits #0..7 in revision.h, #8..10 in commit.c */\n #define THEY_HAVE\t(1u << 11)\n@@ -748,7 +749,7 @@ int main(int argc, char **argv)\n \t}\n \n \tif (i != argc-1)\n-\t\tusage(upload_pack_usage);\n+\t\tusage(git_upload_pack_usage);\n \n \tsetup_path();\n \ndiff --git a/var.c b/var.c\nindex 125c0d1..402b5d3 100644\n--- a/var.c\n+++ b/var.c\n@@ -6,7 +6,7 @@\n #include \"cache.h\"\n #include \"exec_cmd.h\"\n \n-static const char var_usage[] = \"git var [-l | <variable>]\";\n+static const char git_var_usage[] = \"git var [-l | <variable>]\";\n \n struct git_var {\n \tconst char *name;\n@@ -53,7 +53,7 @@ int main(int argc, char **argv)\n \tconst char *val;\n \tint nongit;\n \tif (argc != 2) {\n-\t\tusage(var_usage);\n+\t\tusage(git_var_usage);\n \t}\n \n \tgit_extract_argv0_path(argv[0]);\n@@ -69,7 +69,7 @@ int main(int argc, char **argv)\n \tgit_config(git_default_config, NULL);\n \tval = read_var(argv[1]);\n \tif (!val)\n-\t\tusage(var_usage);\n+\t\tusage(git_var_usage);\n \n \tprintf(\"%s\\n\", val);\n \n-- \n1.6.5.rc1.38.gddf44.dirty\n"}]}