{"thread":{"id":"38346","subject":"[PATCH v2] standardize usage info string format","startedAt":"2015-01-13T07:44:47Z","lastAt":"2015-01-14T17:31:22Z","messageCount":5,"participants":["Alex Henrie","Junio C Hamano","Matthieu Moy"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"254594","messageId":"1421135087-7284-1-git-send-email-alexhenrie24@gmail.com","threadId":"38346","inReplyTo":null,"subject":"[PATCH v2] standardize usage info string format","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2015-01-13T07:44:47Z","receivedAt":"2015-01-13T07:44:47Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"This patch puts the usage info strings that were not already in docopt-\nlike format into docopt-like format, which will be a litle easier for\nend users and a lot easier for translators. Changes include:\n\n- Placing angle brackets around fill-in-the-blank parameters\n- Putting dashes in multiword parameter names\n- Adding spaces to [-f|--foobar] to make [-f | --foobar]\n- Replacing <foobar>* with [<foobar>...]\n\nSigned-off-by: Alex Henrie <alexhenrie24@gmail.com>\n---\n Documentation/CodingGuidelines |  8 ++++++--\n advice.c                       |  2 +-\n archive.c                      |  4 ++--\n builtin/add.c                  |  2 +-\n builtin/apply.c                |  2 +-\n builtin/blame.c                |  4 ++--\n builtin/branch.c               |  8 ++++----\n builtin/cat-file.c             |  4 ++--\n builtin/check-attr.c           |  4 ++--\n builtin/check-ignore.c         |  4 ++--\n builtin/check-mailmap.c        |  2 +-\n builtin/check-ref-format.c     |  2 +-\n builtin/checkout-index.c       |  2 +-\n builtin/checkout.c             |  8 ++++----\n builtin/clone.c                |  2 +-\n builtin/column.c               |  2 +-\n builtin/commit.c               |  4 ++--\n builtin/config.c               |  2 +-\n builtin/describe.c             |  4 ++--\n builtin/diff-files.c           |  2 +-\n builtin/diff-index.c           |  2 +-\n builtin/diff-tree.c            |  2 +-\n builtin/fetch-pack.c           |  2 +-\n builtin/fmt-merge-msg.c        |  2 +-\n builtin/for-each-ref.c         |  2 +-\n builtin/fsck.c                 |  2 +-\n builtin/gc.c                   |  2 +-\n builtin/grep.c                 |  2 +-\n builtin/hash-object.c          |  2 +-\n builtin/help.c                 |  2 +-\n builtin/init-db.c              |  2 +-\n builtin/log.c                  |  6 +++---\n builtin/ls-files.c             |  2 +-\n builtin/ls-remote.c            |  2 +-\n builtin/mailinfo.c             |  2 +-\n builtin/merge-base.c           |  4 ++--\n builtin/merge-file.c           |  4 ++--\n builtin/merge-index.c          |  2 +-\n builtin/merge.c                |  4 ++--\n builtin/mv.c                   |  2 +-\n builtin/name-rev.c             |  6 +++---\n builtin/notes.c                | 24 ++++++++++++------------\n builtin/pack-redundant.c       |  2 +-\n builtin/pack-refs.c            |  2 +-\n builtin/prune-packed.c         |  2 +-\n builtin/remote.c               |  4 ++--\n builtin/repack.c               |  2 +-\n builtin/rerere.c               |  2 +-\n builtin/rev-parse.c            |  6 +++---\n builtin/revert.c               |  4 ++--\n builtin/rm.c                   |  2 +-\n builtin/shortlog.c             |  2 +-\n builtin/show-branch.c          |  4 ++--\n builtin/show-ref.c             |  2 +-\n builtin/symbolic-ref.c         |  4 ++--\n builtin/tag.c                  |  4 ++--\n builtin/update-index.c         |  2 +-\n builtin/update-ref.c           |  6 +++---\n builtin/verify-commit.c        |  2 +-\n builtin/verify-pack.c          |  2 +-\n builtin/verify-tag.c           |  2 +-\n credential-store.c             |  2 +-\n git-bisect.sh                  |  2 +-\n git.c                          |  2 +-\n 64 files changed, 109 insertions(+), 105 deletions(-)\n\ndiff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines\nindex 894546d..ad3b2ad 100644\n--- a/Documentation/CodingGuidelines\n+++ b/Documentation/CodingGuidelines\n@@ -441,6 +441,10 @@ Writing Documentation:\n    --sort=<key>\n    --abbrev[=<n>]\n \n+ If a placeholder has multiple words, they are separated by dashes:\n+   <new-branch-name>\n+   --template=<template-directory>\n+\n  Possibility of multiple occurrences is indicated by three dots:\n    <file>...\n    (One or more of <file>.)\n@@ -457,12 +461,12 @@ Writing Documentation:\n    (Zero or more of <patch>.  Note that the dots are inside, not\n    outside the brackets.)\n \n- Multiple alternatives are indicated with vertical bar:\n+ Multiple alternatives are indicated with vertical bars:\n    [-q | --quiet]\n    [--utf8 | --no-utf8]\n \n  Parentheses are used for grouping:\n-   [(<rev>|<range>)...]\n+   [(<rev> | <range>)...]\n    (Any number of either <rev> or <range>.  Parens are needed to make\n    it clear that \"...\" pertains to both <rev> and <range>.)\n \ndiff --git a/advice.c b/advice.c\nindex 3b8bf3c..575bec2 100644\n--- a/advice.c\n+++ b/advice.c\n@@ -105,7 +105,7 @@ void detach_advice(const char *new_name)\n \t\"state without impacting any branches by performing another checkout.\\n\\n\"\n \t\"If you want to create a new branch to retain commits you create, you may\\n\"\n \t\"do so (now or later) by using -b with the checkout command again. Example:\\n\\n\"\n-\t\"  git checkout -b new_branch_name\\n\\n\";\n+\t\"  git checkout -b <new-branch-name>\\n\\n\";\n \n \tfprintf(stderr, fmt, new_name);\n }\ndiff --git a/archive.c b/archive.c\nindex 9e30246..96057ed 100644\n--- a/archive.c\n+++ b/archive.c\n@@ -8,9 +8,9 @@\n #include \"dir.h\"\n \n static char const * const archive_usage[] = {\n-\tN_(\"git archive [options] <tree-ish> [<path>...]\"),\n+\tN_(\"git archive [<options>] <tree-ish> [<path>...]\"),\n \tN_(\"git archive --list\"),\n-\tN_(\"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]\"),\n+\tN_(\"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]\"),\n \tN_(\"git archive --remote <repo> [--exec <cmd>] --list\"),\n \tNULL\n };\ndiff --git a/builtin/add.c b/builtin/add.c\nindex 1074e32..3390933 100644\n--- a/builtin/add.c\n+++ b/builtin/add.c\n@@ -19,7 +19,7 @@\n #include \"argv-array.h\"\n \n static const char * const builtin_add_usage[] = {\n-\tN_(\"git add [options] [--] <pathspec>...\"),\n+\tN_(\"git add [<options>] [--] <pathspec>...\"),\n \tNULL\n };\n static int patch_interactive, add_interactive, edit_interactive;\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex 0aad912..7cd9a3b 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -55,7 +55,7 @@ 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-\tN_(\"git apply [options] [<patch>...]\"),\n+\tN_(\"git apply [<options>] [<patch>...]\"),\n \tNULL\n };\n \ndiff --git a/builtin/blame.c b/builtin/blame.c\nindex 303e217..f0fac65 100644\n--- a/builtin/blame.c\n+++ b/builtin/blame.c\n@@ -27,12 +27,12 @@\n #include \"line-range.h\"\n #include \"line-log.h\"\n \n-static char blame_usage[] = N_(\"git blame [options] [rev-opts] [rev] [--] file\");\n+static char blame_usage[] = N_(\"git blame [<options>] [<rev-opts>] [<rev>] [--] file\");\n \n static const char *blame_opt_usage[] = {\n \tblame_usage,\n \t\"\",\n-\tN_(\"[rev-opts] are documented in git-rev-list(1)\"),\n+\tN_(\"<rev-opts> are documented in git-rev-list(1)\"),\n \tNULL\n };\n \ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex dc6f0b2..6a25957 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -21,10 +21,10 @@\n #include \"wt-status.h\"\n \n static const char * const builtin_branch_usage[] = {\n-\tN_(\"git branch [options] [-r | -a] [--merged | --no-merged]\"),\n-\tN_(\"git branch [options] [-l] [-f] <branchname> [<start-point>]\"),\n-\tN_(\"git branch [options] [-r] (-d | -D) <branchname>...\"),\n-\tN_(\"git branch [options] (-m | -M) [<oldbranch>] <newbranch>\"),\n+\tN_(\"git branch [<options>] [-r | -a] [--merged | --no-merged]\"),\n+\tN_(\"git branch [<options>] [-l] [-f] <branch-name> [<start-point>]\"),\n+\tN_(\"git branch [<options>] [-r] (-d | -D) <branch-name>...\"),\n+\tN_(\"git branch [<options>] (-m | -M) [<old-branch>] <new-branch>\"),\n \tNULL\n };\n \ndiff --git a/builtin/cat-file.c b/builtin/cat-file.c\nindex f8d8129..c2e4e53 100644\n--- a/builtin/cat-file.c\n+++ b/builtin/cat-file.c\n@@ -329,8 +329,8 @@ static int batch_objects(struct batch_options *opt)\n }\n \n static const char * const cat_file_usage[] = {\n-\tN_(\"git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>\"),\n-\tN_(\"git cat-file (--batch|--batch-check) < <list_of_objects>\"),\n+\tN_(\"git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>\"),\n+\tN_(\"git cat-file (--batch | --batch-check) < <list-of-objects>\"),\n \tNULL\n };\n \ndiff --git a/builtin/check-attr.c b/builtin/check-attr.c\nindex 5600ec3..21d2bed 100644\n--- a/builtin/check-attr.c\n+++ b/builtin/check-attr.c\n@@ -8,8 +8,8 @@ static int all_attrs;\n static int cached_attrs;\n static int stdin_paths;\n static const char * const check_attr_usage[] = {\n-N_(\"git check-attr [-a | --all | attr...] [--] pathname...\"),\n-N_(\"git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>\"),\n+N_(\"git check-attr [-a | --all | <attr>...] [--] <pathname>...\"),\n+N_(\"git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>\"),\n NULL\n };\n \ndiff --git a/builtin/check-ignore.c b/builtin/check-ignore.c\nindex 594463a..dc8d97c 100644\n--- a/builtin/check-ignore.c\n+++ b/builtin/check-ignore.c\n@@ -7,8 +7,8 @@\n \n static int quiet, verbose, stdin_paths, show_non_matching, no_index;\n static const char * const check_ignore_usage[] = {\n-\"git check-ignore [options] pathname...\",\n-\"git check-ignore [options] --stdin < <list-of-paths>\",\n+\"git check-ignore [<options>] <pathname>...\",\n+\"git check-ignore [<options>] --stdin < <list-of-paths>\",\n NULL\n };\n \ndiff --git a/builtin/check-mailmap.c b/builtin/check-mailmap.c\nindex 8f4d809..eaaea54 100644\n--- a/builtin/check-mailmap.c\n+++ b/builtin/check-mailmap.c\n@@ -5,7 +5,7 @@\n \n static int use_stdin;\n static const char * const check_mailmap_usage[] = {\n-N_(\"git check-mailmap [options] <contact>...\"),\n+N_(\"git check-mailmap [<options>] <contact>...\"),\n NULL\n };\n \ndiff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c\nindex 28a7320..fd915d5 100644\n--- a/builtin/check-ref-format.c\n+++ b/builtin/check-ref-format.c\n@@ -8,7 +8,7 @@\n #include \"strbuf.h\"\n \n static const char builtin_check_ref_format_usage[] =\n-\"git check-ref-format [--normalize] [options] <refname>\\n\"\n+\"git check-ref-format [--normalize] [<options>] <refname>\\n\"\n \"   or: git check-ref-format --branch <branchname-shorthand>\";\n \n /*\ndiff --git a/builtin/checkout-index.c b/builtin/checkout-index.c\nindex 031780f..9ca2da1 100644\n--- a/builtin/checkout-index.c\n+++ b/builtin/checkout-index.c\n@@ -123,7 +123,7 @@ static void checkout_all(const char *prefix, int prefix_length)\n }\n \n static const char * const builtin_checkout_index_usage[] = {\n-\tN_(\"git checkout-index [options] [--] [<file>...]\"),\n+\tN_(\"git checkout-index [<options>] [--] [<file>...]\"),\n \tNULL\n };\n \ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex 52d6cbb..3e141fc 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -22,8 +22,8 @@\n #include \"argv-array.h\"\n \n static const char * const checkout_usage[] = {\n-\tN_(\"git checkout [options] <branch>\"),\n-\tN_(\"git checkout [options] [<branch>] -- <file>...\"),\n+\tN_(\"git checkout [<options>] <branch>\"),\n+\tN_(\"git checkout [<options>] [<branch>] -- <file>...\"),\n \tNULL,\n };\n \n@@ -746,7 +746,7 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)\n \t\t\t_(\n \t\t\t\"If you want to keep them by creating a new branch, \"\n \t\t\t\"this may be a good time\\nto do so with:\\n\\n\"\n-\t\t\t\" git branch new_branch_name %s\\n\\n\"),\n+\t\t\t\" git branch <new-branch-name> %s\\n\\n\"),\n \t\t\tfind_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));\n }\n \n@@ -1127,7 +1127,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \t\tOPT_BOOL(0, \"ignore-skip-worktree-bits\", &opts.ignore_skipworktree,\n \t\t\t N_(\"do not limit pathspecs to sparse entries only\")),\n \t\tOPT_HIDDEN_BOOL(0, \"guess\", &dwim_new_local_branch,\n-\t\t\t\tN_(\"second guess 'git checkout no-such-branch'\")),\n+\t\t\t\tN_(\"second guess 'git checkout <no-such-branch>'\")),\n \t\tOPT_END(),\n \t};\n \ndiff --git a/builtin/clone.c b/builtin/clone.c\nindex 316c75d..9572467 100644\n--- a/builtin/clone.c\n+++ b/builtin/clone.c\n@@ -34,7 +34,7 @@\n  *\n  */\n static const char * const builtin_clone_usage[] = {\n-\tN_(\"git clone [options] [--] <repo> [<dir>]\"),\n+\tN_(\"git clone [<options>] [--] <repo> [<dir>]\"),\n \tNULL\n };\n \ndiff --git a/builtin/column.c b/builtin/column.c\nindex 7581852..449413c 100644\n--- a/builtin/column.c\n+++ b/builtin/column.c\n@@ -6,7 +6,7 @@\n #include \"column.h\"\n \n static const char * const builtin_column_usage[] = {\n-\tN_(\"git column [options]\"),\n+\tN_(\"git column [<options>]\"),\n \tNULL\n };\n static unsigned int colopts;\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 7d90c35..6716e11 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -34,12 +34,12 @@\n #include \"mailmap.h\"\n \n static const char * const builtin_commit_usage[] = {\n-\tN_(\"git commit [options] [--] <pathspec>...\"),\n+\tN_(\"git commit [<options>] [--] <pathspec>...\"),\n \tNULL\n };\n \n static const char * const builtin_status_usage[] = {\n-\tN_(\"git status [options] [--] <pathspec>...\"),\n+\tN_(\"git status [<options>] [--] <pathspec>...\"),\n \tNULL\n };\n \ndiff --git a/builtin/config.c b/builtin/config.c\nindex 15a7bea..d32c532 100644\n--- a/builtin/config.c\n+++ b/builtin/config.c\n@@ -5,7 +5,7 @@\n #include \"urlmatch.h\"\n \n static const char *const builtin_config_usage[] = {\n-\tN_(\"git config [options]\"),\n+\tN_(\"git config [<options>]\"),\n \tNULL\n };\n \ndiff --git a/builtin/describe.c b/builtin/describe.c\nindex 9103193..e00a75b 100644\n--- a/builtin/describe.c\n+++ b/builtin/describe.c\n@@ -14,8 +14,8 @@\n #define MAX_TAGS\t(FLAG_BITS - 1)\n \n static const char * const describe_usage[] = {\n-\tN_(\"git describe [options] <commit-ish>*\"),\n-\tN_(\"git describe [options] --dirty\"),\n+\tN_(\"git describe [<options>] [<commit-ish>...]\"),\n+\tN_(\"git describe [<options>] --dirty\"),\n \tNULL\n };\n \ndiff --git a/builtin/diff-files.c b/builtin/diff-files.c\nindex 9200069..8ed2eb8 100644\n--- a/builtin/diff-files.c\n+++ b/builtin/diff-files.c\n@@ -11,7 +11,7 @@\n #include \"submodule.h\"\n \n static const char diff_files_usage[] =\n-\"git diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]\"\n+\"git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\"\n COMMON_DIFF_OPTIONS_HELP;\n \n int cmd_diff_files(int argc, const char **argv, const char *prefix)\ndiff --git a/builtin/diff-index.c b/builtin/diff-index.c\nindex ce15b23..d979824 100644\n--- a/builtin/diff-index.c\n+++ b/builtin/diff-index.c\n@@ -7,7 +7,7 @@\n \n static const char diff_cache_usage[] =\n \"git diff-index [-m] [--cached] \"\n-\"[<common diff options>] <tree-ish> [<path>...]\"\n+\"[<common-diff-options>] <tree-ish> [<path>...]\"\n COMMON_DIFF_OPTIONS_HELP;\n \n int cmd_diff_index(int argc, const char **argv, const char *prefix)\ndiff --git a/builtin/diff-tree.c b/builtin/diff-tree.c\nindex 1c4ad62..12b683d 100644\n--- a/builtin/diff-tree.c\n+++ b/builtin/diff-tree.c\n@@ -82,7 +82,7 @@ static int diff_tree_stdin(char *line)\n \n static const char 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+\"[<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\\n\"\n \"  -r            diff recursively\\n\"\n \"  --root        include the initial commit as diff against /dev/null\\n\"\n COMMON_DIFF_OPTIONS_HELP;\ndiff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c\nindex 1262b40..4a6b340 100644\n--- a/builtin/fetch-pack.c\n+++ b/builtin/fetch-pack.c\n@@ -6,7 +6,7 @@\n #include \"sha1-array.h\"\n \n static const char fetch_pack_usage[] =\n-\"git fetch-pack [--all] [--stdin] [--quiet|-q] [--keep|-k] [--thin] \"\n+\"git fetch-pack [--all] [--stdin] [--quiet | -q] [--keep | -k] [--thin] \"\n \"[--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] \"\n \"[--no-progress] [--diag-url] [-v] [<host>:]<directory> [<refs>...]\";\n \ndiff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c\nindex af7919e..1d962dc 100644\n--- a/builtin/fmt-merge-msg.c\n+++ b/builtin/fmt-merge-msg.c\n@@ -10,7 +10,7 @@\n #include \"gpg-interface.h\"\n \n static const char * const fmt_merge_msg_usage[] = {\n-\tN_(\"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]\"),\n+\tN_(\"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]\"),\n \tNULL\n };\n \ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex f3ce004..c97368a 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -1054,7 +1054,7 @@ static int opt_parse_sort(const struct option *opt, const char *arg, int unset)\n }\n \n static char const * const for_each_ref_usage[] = {\n-\tN_(\"git for-each-ref [options] [<pattern>]\"),\n+\tN_(\"git for-each-ref [<options>] [<pattern>]\"),\n \tNULL\n };\n \ndiff --git a/builtin/fsck.c b/builtin/fsck.c\nindex a27515a..0c75786 100644\n--- a/builtin/fsck.c\n+++ b/builtin/fsck.c\n@@ -600,7 +600,7 @@ static int fsck_cache_tree(struct cache_tree *it)\n }\n \n static char const * const fsck_usage[] = {\n-\tN_(\"git fsck [options] [<object>...]\"),\n+\tN_(\"git fsck [<options>] [<object>...]\"),\n \tNULL\n };\n \ndiff --git a/builtin/gc.c b/builtin/gc.c\nindex 005adbe..5c634af 100644\n--- a/builtin/gc.c\n+++ b/builtin/gc.c\n@@ -21,7 +21,7 @@\n #define FAILED_RUN \"failed to run %s\"\n \n static const char * const builtin_gc_usage[] = {\n-\tN_(\"git gc [options]\"),\n+\tN_(\"git gc [<options>]\"),\n \tNULL\n };\n \ndiff --git a/builtin/grep.c b/builtin/grep.c\nindex 4063882..9262b73 100644\n--- a/builtin/grep.c\n+++ b/builtin/grep.c\n@@ -20,7 +20,7 @@\n #include \"pathspec.h\"\n \n static char const * const grep_usage[] = {\n-\tN_(\"git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]\"),\n+\tN_(\"git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]\"),\n \tNULL\n };\n \ndiff --git a/builtin/hash-object.c b/builtin/hash-object.c\nindex 6158363..207b90c 100644\n--- a/builtin/hash-object.c\n+++ b/builtin/hash-object.c\n@@ -79,7 +79,7 @@ static void hash_stdin_paths(const char *type, int no_filters, unsigned flags,\n int cmd_hash_object(int argc, const char **argv, const char *prefix)\n {\n \tstatic const char * const hash_object_usage[] = {\n-\t\tN_(\"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] <file>...\"),\n+\t\tN_(\"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] [--] <file>...\"),\n \t\tN_(\"git hash-object  --stdin-paths < <list-of-paths>\"),\n \t\tNULL\n \t};\ndiff --git a/builtin/help.c b/builtin/help.c\nindex e78c135..6133fe4 100644\n--- a/builtin/help.c\n+++ b/builtin/help.c\n@@ -49,7 +49,7 @@ static struct option builtin_help_options[] = {\n };\n \n static const char * const builtin_help_usage[] = {\n-\tN_(\"git help [--all] [--guides] [--man|--web|--info] [command]\"),\n+\tN_(\"git help [--all] [--guides] [--man | --web | --info] [<command>]\"),\n \tNULL\n };\n \ndiff --git a/builtin/init-db.c b/builtin/init-db.c\nindex 9966522..6723d39 100644\n--- a/builtin/init-db.c\n+++ b/builtin/init-db.c\n@@ -472,7 +472,7 @@ static int shared_callback(const struct option *opt, const char *arg, int unset)\n }\n \n static const char *const init_db_usage[] = {\n-\tN_(\"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]] [directory]\"),\n+\tN_(\"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]] [<directory>]\"),\n \tNULL\n };\n \ndiff --git a/builtin/log.c b/builtin/log.c\nindex f2a9f01..d65d96a 100644\n--- a/builtin/log.c\n+++ b/builtin/log.c\n@@ -38,8 +38,8 @@ static const char *fmt_patch_subject_prefix = \"PATCH\";\n static const char *fmt_pretty;\n \n static const char * const builtin_log_usage[] = {\n-\tN_(\"git log [<options>] [<revision range>] [[--] <path>...]\\n\")\n-\tN_(\"   or: git show [options] <object>...\"),\n+\tN_(\"git log [<options>] [<revision-range>] [[--] <path>...]\\n\")\n+\tN_(\"   or: git show [<options>] <object>...\"),\n \tNULL\n };\n \n@@ -1023,7 +1023,7 @@ static const char *set_outdir(const char *prefix, const char *output_directory)\n }\n \n static const char * const builtin_format_patch_usage[] = {\n-\tN_(\"git format-patch [options] [<since> | <revision range>]\"),\n+\tN_(\"git format-patch [<options>] [<since> | <revision-range>]\"),\n \tNULL\n };\n \ndiff --git a/builtin/ls-files.c b/builtin/ls-files.c\nindex 99cee20..914054d 100644\n--- a/builtin/ls-files.c\n+++ b/builtin/ls-files.c\n@@ -398,7 +398,7 @@ int report_path_error(const char *ps_matched,\n }\n \n static const char * const ls_files_usage[] = {\n-\tN_(\"git ls-files [options] [<file>...]\"),\n+\tN_(\"git ls-files [<options>] [<file>...]\"),\n \tNULL\n };\n \ndiff --git a/builtin/ls-remote.c b/builtin/ls-remote.c\nindex b2a4b92..4554dbc 100644\n--- a/builtin/ls-remote.c\n+++ b/builtin/ls-remote.c\n@@ -5,7 +5,7 @@\n \n static const char ls_remote_usage[] =\n \"git ls-remote [--heads] [--tags]  [-u <exec> | --upload-pack <exec>]\\n\"\n-\"                     [-q|--quiet] [--exit-code] [--get-url] [<repository> [<refs>...]]\";\n+\"                     [-q | --quiet] [--exit-code] [--get-url] [<repository> [<refs>...]]\";\n \n /*\n  * Is there one among the list of patterns that match the tail part\ndiff --git a/builtin/mailinfo.c b/builtin/mailinfo.c\nindex c8a47c1..999a525 100644\n--- a/builtin/mailinfo.c\n+++ b/builtin/mailinfo.c\n@@ -1031,7 +1031,7 @@ static int git_mailinfo_config(const char *var, const char *value, void *unused)\n }\n \n static const char mailinfo_usage[] =\n-\t\"git mailinfo [-k|-b] [-m | --message-id] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info\";\n+\t\"git mailinfo [-k | -b] [-m | --message-id] [-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 {\ndiff --git a/builtin/merge-base.c b/builtin/merge-base.c\nindex fdebef6..08a8217 100644\n--- a/builtin/merge-base.c\n+++ b/builtin/merge-base.c\n@@ -26,8 +26,8 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)\n }\n \n static const char * const merge_base_usage[] = {\n-\tN_(\"git merge-base [-a|--all] <commit> <commit>...\"),\n-\tN_(\"git merge-base [-a|--all] --octopus <commit>...\"),\n+\tN_(\"git merge-base [-a | --all] <commit> <commit>...\"),\n+\tN_(\"git merge-base [-a | --all] --octopus <commit>...\"),\n \tN_(\"git merge-base --independent <commit>...\"),\n \tN_(\"git merge-base --is-ancestor <commit> <commit>\"),\n \tN_(\"git merge-base --fork-point <ref> [<commit>]\"),\ndiff --git a/builtin/merge-file.c b/builtin/merge-file.c\nindex 844f84f..131edc2 100644\n--- a/builtin/merge-file.c\n+++ b/builtin/merge-file.c\n@@ -5,7 +5,7 @@\n #include \"parse-options.h\"\n \n static const char *const merge_file_usage[] = {\n-\tN_(\"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2\"),\n+\tN_(\"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>\"),\n \tNULL\n };\n \n@@ -42,7 +42,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)\n \t\t\t    N_(\"for conflicts, use this marker size\")),\n \t\tOPT__QUIET(&quiet, N_(\"do not warn about conflicts\")),\n \t\tOPT_CALLBACK('L', NULL, names, N_(\"name\"),\n-\t\t\t     N_(\"set labels for file1/orig_file/file2\"), &label_cb),\n+\t\t\t     N_(\"set labels for file1/orig-file/file2\"), &label_cb),\n \t\tOPT_END(),\n \t};\n \ndiff --git a/builtin/merge-index.c b/builtin/merge-index.c\nindex b416d92..1a1eafa 100644\n--- a/builtin/merge-index.c\n+++ b/builtin/merge-index.c\n@@ -75,7 +75,7 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix)\n \tsignal(SIGCHLD, SIG_DFL);\n \n \tif (argc < 3)\n-\t\tusage(\"git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)\");\n+\t\tusage(\"git merge-index [-o] [-q] <merge-program> (-a | [--] [<filename>...])\");\n \n \tread_cache();\n \ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex c638fd5..3b0f8f9 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -42,8 +42,8 @@ struct strategy {\n };\n \n static const char * const builtin_merge_usage[] = {\n-\tN_(\"git merge [options] [<commit>...]\"),\n-\tN_(\"git merge [options] <msg> HEAD <commit>\"),\n+\tN_(\"git merge [<options>] [<commit>...]\"),\n+\tN_(\"git merge [<options>] <msg> HEAD <commit>\"),\n \tN_(\"git merge --abort\"),\n \tNULL\n };\ndiff --git a/builtin/mv.c b/builtin/mv.c\nindex 563d05b..d1d4316 100644\n--- a/builtin/mv.c\n+++ b/builtin/mv.c\n@@ -12,7 +12,7 @@\n #include \"submodule.h\"\n \n static const char * const builtin_mv_usage[] = {\n-\tN_(\"git mv [options] <source>... <destination>\"),\n+\tN_(\"git mv [<options>] <source>... <destination>\"),\n \tNULL\n };\n \ndiff --git a/builtin/name-rev.c b/builtin/name-rev.c\nindex 3c8f319..9736d44 100644\n--- a/builtin/name-rev.c\n+++ b/builtin/name-rev.c\n@@ -252,9 +252,9 @@ static void show_name(const struct object *obj,\n }\n \n static char const * const name_rev_usage[] = {\n-\tN_(\"git name-rev [options] <commit>...\"),\n-\tN_(\"git name-rev [options] --all\"),\n-\tN_(\"git name-rev [options] --stdin\"),\n+\tN_(\"git name-rev [<options>] <commit>...\"),\n+\tN_(\"git name-rev [<options>] --all\"),\n+\tN_(\"git name-rev [<options>] --stdin\"),\n \tNULL\n };\n \ndiff --git a/builtin/notes.c b/builtin/notes.c\nindex a9f37d0..63f95fc 100644\n--- a/builtin/notes.c\n+++ b/builtin/notes.c\n@@ -21,18 +21,18 @@\n #include \"notes-utils.h\"\n \n static const char * const git_notes_usage[] = {\n-\tN_(\"git notes [--ref <notes_ref>] [list [<object>]]\"),\n-\tN_(\"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]\"),\n-\tN_(\"git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>\"),\n-\tN_(\"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]\"),\n-\tN_(\"git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]\"),\n-\tN_(\"git notes [--ref <notes_ref>] show [<object>]\"),\n-\tN_(\"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>\"),\n+\tN_(\"git notes [--ref <notes-ref>] [list [<object>]]\"),\n+\tN_(\"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]\"),\n+\tN_(\"git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>\"),\n+\tN_(\"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]\"),\n+\tN_(\"git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]\"),\n+\tN_(\"git notes [--ref <notes-ref>] show [<object>]\"),\n+\tN_(\"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>\"),\n \tN_(\"git notes merge --commit [-v | -q]\"),\n \tN_(\"git notes merge --abort [-v | -q]\"),\n-\tN_(\"git notes [--ref <notes_ref>] remove [<object>...]\"),\n-\tN_(\"git notes [--ref <notes_ref>] prune [-n | -v]\"),\n-\tN_(\"git notes [--ref <notes_ref>] get-ref\"),\n+\tN_(\"git notes [--ref <notes-ref>] remove [<object>...]\"),\n+\tN_(\"git notes [--ref <notes-ref>] prune [-n | -v]\"),\n+\tN_(\"git notes [--ref <notes-ref>] get-ref\"),\n \tNULL\n };\n \n@@ -68,7 +68,7 @@ static const char * const git_notes_show_usage[] = {\n };\n \n static const char * const git_notes_merge_usage[] = {\n-\tN_(\"git notes merge [<options>] <notes_ref>\"),\n+\tN_(\"git notes merge [<options>] <notes-ref>\"),\n \tN_(\"git notes merge --commit [<options>]\"),\n \tN_(\"git notes merge --abort [<options>]\"),\n \tNULL\n@@ -951,7 +951,7 @@ int cmd_notes(int argc, const char **argv, const char *prefix)\n \tconst char *override_notes_ref = NULL;\n \tstruct option options[] = {\n \t\tOPT_STRING(0, \"ref\", &override_notes_ref, N_(\"notes-ref\"),\n-\t\t\t   N_(\"use notes from <notes_ref>\")),\n+\t\t\t   N_(\"use notes from <notes-ref>\")),\n \t\tOPT_END()\n \t};\n \ndiff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c\nindex 649c3aa..d0532f6 100644\n--- a/builtin/pack-redundant.c\n+++ b/builtin/pack-redundant.c\n@@ -11,7 +11,7 @@\n #define BLKSIZE 512\n \n static const char pack_redundant_usage[] =\n-\"git pack-redundant [ --verbose ] [ --alt-odb ] < --all | <.pack filename> ...>\";\n+\"git pack-redundant [--verbose] [--alt-odb] (--all | <filename.pack>...)\";\n \n static int load_all_packs, verbose, alt_odb;\n \ndiff --git a/builtin/pack-refs.c b/builtin/pack-refs.c\nindex b20b1ec..39f9a55 100644\n--- a/builtin/pack-refs.c\n+++ b/builtin/pack-refs.c\n@@ -3,7 +3,7 @@\n #include \"refs.h\"\n \n static char const * const pack_refs_usage[] = {\n-\tN_(\"git pack-refs [options]\"),\n+\tN_(\"git pack-refs [<options>]\"),\n \tNULL\n };\n \ndiff --git a/builtin/prune-packed.c b/builtin/prune-packed.c\nindex f24a2c2..7cf900e 100644\n--- a/builtin/prune-packed.c\n+++ b/builtin/prune-packed.c\n@@ -4,7 +4,7 @@\n #include \"parse-options.h\"\n \n static const char * const prune_packed_usage[] = {\n-\tN_(\"git prune-packed [-n|--dry-run] [-q|--quiet]\"),\n+\tN_(\"git prune-packed [-n | --dry-run] [-q | --quiet]\"),\n \tNULL\n };\n \ndiff --git a/builtin/remote.c b/builtin/remote.c\nindex 46ecfd9..33ff7e0 100644\n--- a/builtin/remote.c\n+++ b/builtin/remote.c\n@@ -10,10 +10,10 @@\n \n static const char * const builtin_remote_usage[] = {\n \tN_(\"git remote [-v | --verbose]\"),\n-\tN_(\"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>\"),\n+\tN_(\"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <name> <url>\"),\n \tN_(\"git remote rename <old> <new>\"),\n \tN_(\"git remote remove <name>\"),\n-\tN_(\"git remote set-head <name> (-a | --auto | -d | --delete |<branch>)\"),\n+\tN_(\"git remote set-head <name> (-a | --auto | -d | --delete | <branch>)\"),\n \tN_(\"git remote [-v | --verbose] show [-n] <name>\"),\n \tN_(\"git remote prune [-n | --dry-run] <name>\"),\n \tN_(\"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]\"),\ndiff --git a/builtin/repack.c b/builtin/repack.c\nindex 3f852f3..28fbc70 100644\n--- a/builtin/repack.c\n+++ b/builtin/repack.c\n@@ -14,7 +14,7 @@ static int write_bitmaps;\n static char *packdir, *packtmp;\n \n static const char *const git_repack_usage[] = {\n-\tN_(\"git repack [options]\"),\n+\tN_(\"git repack [<options>]\"),\n \tNULL\n };\n \ndiff --git a/builtin/rerere.c b/builtin/rerere.c\nindex 98eb8c5..7afadd2 100644\n--- a/builtin/rerere.c\n+++ b/builtin/rerere.c\n@@ -9,7 +9,7 @@\n #include \"pathspec.h\"\n \n static const char * const rerere_usage[] = {\n-\tN_(\"git rerere [clear | forget path... | status | remaining | diff | gc]\"),\n+\tN_(\"git rerere [clear | forget <path>... | status | remaining | diff | gc]\"),\n \tNULL,\n };\n \ndiff --git a/builtin/rev-parse.c b/builtin/rev-parse.c\nindex 95328b8..3626c61 100644\n--- a/builtin/rev-parse.c\n+++ b/builtin/rev-parse.c\n@@ -358,7 +358,7 @@ 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-\t\tN_(\"git rev-parse --parseopt [options] -- [<args>...]\"),\n+\t\tN_(\"git rev-parse --parseopt [<options>] -- [<args>...]\"),\n \t\tNULL\n \t};\n \tstatic struct option parseopt_opts[] = {\n@@ -496,9 +496,9 @@ static void die_no_single_rev(int quiet)\n }\n \n static const char builtin_rev_parse_usage[] =\n-N_(\"git rev-parse --parseopt [options] -- [<args>...]\\n\"\n+N_(\"git rev-parse --parseopt [<options>] -- [<args>...]\\n\"\n    \"   or: git rev-parse --sq-quote [<arg>...]\\n\"\n-   \"   or: git rev-parse [options] [<arg>...]\\n\"\n+   \"   or: git rev-parse [<options>] [<arg>...]\\n\"\n    \"\\n\"\n    \"Run \\\"git rev-parse --parseopt -h\\\" for more information on the first usage.\");\n \ndiff --git a/builtin/revert.c b/builtin/revert.c\nindex f9ed5bd..56a2c36 100644\n--- a/builtin/revert.c\n+++ b/builtin/revert.c\n@@ -19,13 +19,13 @@\n  */\n \n static const char * const revert_usage[] = {\n-\tN_(\"git revert [options] <commit-ish>...\"),\n+\tN_(\"git revert [<options>] <commit-ish>...\"),\n \tN_(\"git revert <subcommand>\"),\n \tNULL\n };\n \n static const char * const cherry_pick_usage[] = {\n-\tN_(\"git cherry-pick [options] <commit-ish>...\"),\n+\tN_(\"git cherry-pick [<options>] <commit-ish>...\"),\n \tN_(\"git cherry-pick <subcommand>\"),\n \tNULL\n };\ndiff --git a/builtin/rm.c b/builtin/rm.c\nindex d8a9c86..3304bff 100644\n--- a/builtin/rm.c\n+++ b/builtin/rm.c\n@@ -14,7 +14,7 @@\n #include \"pathspec.h\"\n \n static const char * const builtin_rm_usage[] = {\n-\tN_(\"git rm [options] [--] <file>...\"),\n+\tN_(\"git rm [<options>] [--] <file>...\"),\n \tNULL\n };\n \ndiff --git a/builtin/shortlog.c b/builtin/shortlog.c\nindex 4b7e536..c0bab6a 100644\n--- a/builtin/shortlog.c\n+++ b/builtin/shortlog.c\n@@ -10,7 +10,7 @@\n #include \"parse-options.h\"\n \n static char const * const shortlog_usage[] = {\n-\tN_(\"git shortlog [<options>] [<revision range>] [[--] [<path>...]]\"),\n+\tN_(\"git shortlog [<options>] [<revision-range>] [[--] [<path>...]]\"),\n \tNULL\n };\n \ndiff --git a/builtin/show-branch.c b/builtin/show-branch.c\nindex 270e39c..e9b37dc 100644\n--- a/builtin/show-branch.c\n+++ b/builtin/show-branch.c\n@@ -6,8 +6,8 @@\n #include \"parse-options.h\"\n \n static const char* show_branch_usage[] = {\n-    N_(\"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"),\n-    N_(\"git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\"),\n+    N_(\"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order] [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"),\n+    N_(\"git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]\"),\n     NULL\n };\n \ndiff --git a/builtin/show-ref.c b/builtin/show-ref.c\nindex 5ba1f30..afb1030 100644\n--- a/builtin/show-ref.c\n+++ b/builtin/show-ref.c\n@@ -7,7 +7,7 @@\n #include \"parse-options.h\"\n \n static const char * const show_ref_usage[] = {\n-\tN_(\"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] \"),\n+\tN_(\"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]\"),\n \tN_(\"git show-ref --exclude-existing[=pattern] < ref-list\"),\n \tNULL\n };\ndiff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c\nindex 29fb3f1..ce0fde7 100644\n--- a/builtin/symbolic-ref.c\n+++ b/builtin/symbolic-ref.c\n@@ -4,8 +4,8 @@\n #include \"parse-options.h\"\n \n static const char * const git_symbolic_ref_usage[] = {\n-\tN_(\"git symbolic-ref [options] name [ref]\"),\n-\tN_(\"git symbolic-ref -d [-q] name\"),\n+\tN_(\"git symbolic-ref [<options>] <name> [<ref>]\"),\n+\tN_(\"git symbolic-ref -d [-q] <name>\"),\n \tNULL\n };\n \ndiff --git a/builtin/tag.c b/builtin/tag.c\nindex e633f4e..6dc85a9 100644\n--- a/builtin/tag.c\n+++ b/builtin/tag.c\n@@ -19,9 +19,9 @@\n #include \"column.h\"\n \n static const char * const git_tag_usage[] = {\n-\tN_(\"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]\"),\n+\tN_(\"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]\"),\n \tN_(\"git tag -d <tagname>...\"),\n-\tN_(\"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \"\n+\tN_(\"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\"\n \t\t\"\\n\\t\\t[<pattern>...]\"),\n \tN_(\"git tag -v <tagname>...\"),\n \tNULL\ndiff --git a/builtin/update-index.c b/builtin/update-index.c\nindex b0e3dc9..5878986 100644\n--- a/builtin/update-index.c\n+++ b/builtin/update-index.c\n@@ -400,7 +400,7 @@ static void read_index_info(int line_termination)\n }\n \n static const char * const update_index_usage[] = {\n-\tN_(\"git update-index [options] [--] [<file>...]\"),\n+\tN_(\"git update-index [<options>] [--] [<file>...]\"),\n \tNULL\n };\n \ndiff --git a/builtin/update-ref.c b/builtin/update-ref.c\nindex 1993529..2497ba4 100644\n--- a/builtin/update-ref.c\n+++ b/builtin/update-ref.c\n@@ -6,9 +6,9 @@\n #include \"argv-array.h\"\n \n static const char * const git_update_ref_usage[] = {\n-\tN_(\"git update-ref [options] -d <refname> [<oldval>]\"),\n-\tN_(\"git update-ref [options]    <refname> <newval> [<oldval>]\"),\n-\tN_(\"git update-ref [options] --stdin [-z]\"),\n+\tN_(\"git update-ref [<options>] -d <refname> [<old-val>]\"),\n+\tN_(\"git update-ref [<options>]    <refname> <new-val> [<old-val>]\"),\n+\tN_(\"git update-ref [<options>] --stdin [-z]\"),\n \tNULL\n };\n \ndiff --git a/builtin/verify-commit.c b/builtin/verify-commit.c\nindex b0f8504..ec0c4e3 100644\n--- a/builtin/verify-commit.c\n+++ b/builtin/verify-commit.c\n@@ -14,7 +14,7 @@\n #include \"gpg-interface.h\"\n \n static const char * const verify_commit_usage[] = {\n-\t\tN_(\"git verify-commit [-v|--verbose] <commit>...\"),\n+\t\tN_(\"git verify-commit [-v | --verbose] <commit>...\"),\n \t\tNULL\n };\n \ndiff --git a/builtin/verify-pack.c b/builtin/verify-pack.c\nindex 7747537..c94e156 100644\n--- a/builtin/verify-pack.c\n+++ b/builtin/verify-pack.c\n@@ -51,7 +51,7 @@ static int verify_one_pack(const char *path, unsigned int flags)\n }\n \n static const char * const verify_pack_usage[] = {\n-\tN_(\"git verify-pack [-v|--verbose] [-s|--stat-only] <pack>...\"),\n+\tN_(\"git verify-pack [-v | --verbose] [-s | --stat-only] <pack>...\"),\n \tNULL\n };\n \ndiff --git a/builtin/verify-tag.c b/builtin/verify-tag.c\nindex 9cdf332..53c68fc 100644\n--- a/builtin/verify-tag.c\n+++ b/builtin/verify-tag.c\n@@ -14,7 +14,7 @@\n #include \"gpg-interface.h\"\n \n static const char * const verify_tag_usage[] = {\n-\t\tN_(\"git verify-tag [-v|--verbose] <tag>...\"),\n+\t\tN_(\"git verify-tag [-v | --verbose] <tag>...\"),\n \t\tNULL\n };\n \ndiff --git a/credential-store.c b/credential-store.c\nindex d435514..925d3f4 100644\n--- a/credential-store.c\n+++ b/credential-store.c\n@@ -118,7 +118,7 @@ static int lookup_credential(const char *fn, struct credential *c)\n int main(int argc, char **argv)\n {\n \tconst char * const usage[] = {\n-\t\t\"git credential-store [options] <action>\",\n+\t\t\"git credential-store [<options>] <action>\",\n \t\tNULL\n \t};\n \tconst char *op;\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex 2fc07ac..ae3fec2 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -127,7 +127,7 @@ bisect_start() {\n \t\tif test \"z$mode\" != \"z--no-checkout\"\n \t\tthen\n \t\t\tgit checkout \"$start_head\" -- ||\n-\t\t\tdie \"$(eval_gettext \"Checking out '\\$start_head' failed. Try 'git bisect reset <validbranch>'.\")\"\n+\t\t\tdie \"$(eval_gettext \"Checking out '\\$start_head' failed. Try 'git bisect reset <valid-branch>'.\")\"\n \t\tfi\n \telse\n \t\t# Get rev from where we start.\ndiff --git a/git.c b/git.c\nindex 82d7a1c..0c029ec 100644\n--- a/git.c\n+++ b/git.c\n@@ -9,7 +9,7 @@\n const char git_usage_string[] =\n \t\"git [--version] [--help] [-C <path>] [-c name=value]\\n\"\n \t\"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\\n\"\n-\t\"           [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]\\n\"\n+\t\"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\\n\"\n \t\"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\\n\"\n \t\"           <command> [<args>]\";\n \n-- \n2.2.1\n"},{"id":"254595","messageId":"CAMMLpeReN_X5+RR8XrxRmt6HQo_Wikv8Ac_xG_mKxmiWdF7GrA@mail.gmail.com","threadId":"38346","inReplyTo":"1421135087-7284-1-git-send-email-alexhenrie24@gmail.com","subject":"Re: [PATCH v2] standardize usage info string format","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2015-01-13T07:49:47Z","receivedAt":"2015-01-13T07:49:47Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"2015-01-12 22:29 GMT-07:00 Scott Schmit <i.grok@comcast.net>:\n>\n> On Wed, Jan 07, 2015 at 11:28:21PM -0700, Alex Henrie wrote:\n> >\n> > diff --git a/builtin/diff-files.c b/builtin/diff-files.c\n> > index 9200069..1abeba6 100644\n> > --- a/builtin/diff-files.c\n> > +++ b/builtin/diff-files.c\n> > @@ -11,7 +11,7 @@\n> >  #include \"submodule.h\"\n> >\n> >  static const char diff_files_usage[] =\n> > -\"git diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]\"\n> > +\"git diff-files [-q] [-0/-1/2/3 | -c | --cc] [<common-diff-options>] [<path>...]\"\n>                          ^^^^^^^^^\n> This deserves cleanup too (the man page shows it as \"[-0|-1|-2|-3|-c|--cc]\").\n>\n> ...which makes me think the man pages need to be modified to match.\n\nPatch v2 cleans up this usage string, but I think the man pages'\ninconsistencies should be addressed separately. The man pages don't\nappear to be translated, so their inconsistencies are unlikely to\ncause translators any headaches.\n\n> Also, it looks like items 1 & 4 are already codified in\n> CodingGuidelines, but items 2 & 3 are new.  If we care to make the\n> changes in 2 & 3, we should document the new conventions there.\n\nPatch v2 modifies the documentation to match. By the way,\nCodingGuidelines was inconsistent before. It had this example without\nspaces:\n\n   [(<rev>|<range>)...]\n\nAnd this example with spaces:\n\n   git remote set-head <name> (-a | -d | <branch>)\n\n> Bike-shedding, I'm sure: I find \"[-0|-1|-2|-3|-c|--cc]\" more\n> readable/logical than \"[-0 | -1 | -2 | -3 | -c | --cc]\" (which I admit\n> seems counter-intuitive), but I wouldn't be surprised if opinions on\n> that are about as split as the existing usage lines are :-).\n\nI counted 29 usage strings that used spaces in this case, and 16 that\ndid not. Since spaces seem to be the more prevalent choice, I'd like\nto use them consistently.\n\nThanks for the feedback!\n\n-Alex\n"},{"id":"254628","messageId":"xmqqegqycnbd.fsf@gitster.dls.corp.google.com","threadId":"38346","inReplyTo":"1421135087-7284-1-git-send-email-alexhenrie24@gmail.com","subject":"Re: [PATCH v2] standardize usage info string format","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-01-13T22:45:10Z","receivedAt":"2015-01-13T22:45:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alex Henrie <alexhenrie24@gmail.com> writes:\n\n> This patch puts the usage info strings that were not already in docopt-\n> like format into docopt-like format, which will be a litle easier for\n> end users and a lot easier for translators. Changes include:\n>\n> - Placing angle brackets around fill-in-the-blank parameters\n> - Putting dashes in multiword parameter names\n> - Adding spaces to [-f|--foobar] to make [-f | --foobar]\n> - Replacing <foobar>* with [<foobar>...]\n>\n> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>\n> ---\n>  Documentation/CodingGuidelines |  8 ++++++--\n>  advice.c                       |  2 +-\n>  archive.c                      |  4 ++--\n>  ...\n>  git.c                          |  2 +-\n>  64 files changed, 109 insertions(+), 105 deletions(-)\n\nA patch that affects this many files is bound to interfere with a\nfew topics already in flight, but after applying it on top of\n2.3-rc0 and then merging the result to 'pu', the textual conflicts\nare still manageable.\n\nI eyeballed it briefly and saw nothing glaringly wrong.  Let's give\nothers some time to glance it over.\n\nThanks (and thanks to those who read the previous iteration).\n"},{"id":"254648","messageId":"vpqy4p5bknl.fsf@anie.imag.fr","threadId":"38346","inReplyTo":"1421135087-7284-1-git-send-email-alexhenrie24@gmail.com","subject":"Re: [PATCH v2] standardize usage info string format","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-01-14T12:40:14Z","receivedAt":"2015-01-14T12:40:14Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Alex Henrie <alexhenrie24@gmail.com> writes:\n\n> This patch puts the usage info strings that were not already in docopt-\n> like format into docopt-like format, which will be a litle easier for\n> end users and a lot easier for translators. Changes include:\n>\n> - Placing angle brackets around fill-in-the-blank parameters\n> - Putting dashes in multiword parameter names\n> - Adding spaces to [-f|--foobar] to make [-f | --foobar]\n> - Replacing <foobar>* with [<foobar>...]\n\nI had a closer look and found it all good.\n\nReviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>\n\nThanks!\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"254662","messageId":"xmqq7fwpb76d.fsf@gitster.dls.corp.google.com","threadId":"38346","inReplyTo":"vpqy4p5bknl.fsf@anie.imag.fr","subject":"Re: [PATCH v2] standardize usage info string format","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-01-14T17:31:22Z","receivedAt":"2015-01-14T17:31:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:\n\n> Alex Henrie <alexhenrie24@gmail.com> writes:\n>\n>> This patch puts the usage info strings that were not already in docopt-\n>> like format into docopt-like format, which will be a litle easier for\n>> end users and a lot easier for translators. Changes include:\n>>\n>> - Placing angle brackets around fill-in-the-blank parameters\n>> - Putting dashes in multiword parameter names\n>> - Adding spaces to [-f|--foobar] to make [-f | --foobar]\n>> - Replacing <foobar>* with [<foobar>...]\n>\n> I had a closer look and found it all good.\n>\n> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>\n>\n> Thanks!\n\nThanks again.\n"}]}