{"thread":{"id":"14440","subject":"[PATCH] Make usage strings dash-less","startedAt":"2008-07-13T13:36:15Z","lastAt":"2008-07-13T13:36:15Z","messageCount":1,"participants":["Stephan Beyer"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"83150","messageId":"1215956175-12949-1-git-send-email-s-beyer@gmx.net","threadId":"14440","inReplyTo":null,"subject":"[PATCH] Make usage strings dash-less","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-07-13T13:36:15Z","receivedAt":"2008-07-13T13:36:15Z","isPatch":true,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"When you misuse a git command, you are shown the usage string.\nBut this is currently shown in the dashed form.  So if you just\ncopy what you see, it will not work, when the dashed form\nis no longer supported.\n\nThis patch makes git commands show the dash-less version.\n\nFor shell scripts that do not specify OPTIONS_SPEC, git-sh-setup.sh\ngenerates a dash-less usage string now.\n\nSigned-off-by: Stephan Beyer <s-beyer@gmx.net>\n---\n\nHi,\n\nthe stupid part of the patch is generated using:\n\n\tsed -i 's/^\\([ \\t]*\\)\"git-/\\1\"git /g' *.c\n\tsed -i 's/^git-/git /' git-*sh\n\nThere haven't been any false positives,\nbut I cannot guarantee that alle occurences in *.c and *.sh\nhave been replaced. ;)\n\nPerl files were changed manually.\nThere, \"$0\" stuff was replaced by constant \"git foo\" strings.\n\nRegards,\n  Stephan\n\n builtin-add.c            |    2 +-\n builtin-apply.c          |    2 +-\n builtin-archive.c        |    2 +-\n builtin-blame.c          |    2 +-\n builtin-branch.c         |    8 ++++----\n builtin-cat-file.c       |    4 ++--\n builtin-check-attr.c     |    2 +-\n builtin-checkout-index.c |    2 +-\n builtin-clean.c          |    2 +-\n builtin-clone.c          |    2 +-\n builtin-commit.c         |    4 ++--\n builtin-config.c         |    2 +-\n builtin-count-objects.c  |    2 +-\n builtin-describe.c       |    2 +-\n builtin-diff-files.c     |    2 +-\n builtin-diff-index.c     |    2 +-\n builtin-diff-tree.c      |    2 +-\n builtin-diff.c           |    2 +-\n builtin-fast-export.c    |    2 +-\n builtin-fetch-pack.c     |    2 +-\n builtin-fetch.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-init-db.c        |    2 +-\n builtin-log.c            |    2 +-\n builtin-ls-files.c       |    2 +-\n builtin-ls-remote.c      |    2 +-\n builtin-ls-tree.c        |    2 +-\n builtin-mailinfo.c       |    2 +-\n builtin-mailsplit.c      |    2 +-\n builtin-merge-base.c     |    2 +-\n builtin-mv.c             |    2 +-\n builtin-name-rev.c       |    2 +-\n builtin-pack-refs.c      |    2 +-\n builtin-prune-packed.c   |    2 +-\n builtin-prune.c          |    2 +-\n builtin-push.c           |    2 +-\n builtin-reflog.c         |    6 +++---\n builtin-rerere.c         |    2 +-\n builtin-reset.c          |    4 ++--\n builtin-rev-list.c       |    2 +-\n builtin-rev-parse.c      |    2 +-\n builtin-revert.c         |    4 ++--\n builtin-rm.c             |    2 +-\n builtin-send-pack.c      |    2 +-\n builtin-shortlog.c       |    2 +-\n builtin-show-branch.c    |    2 +-\n builtin-symbolic-ref.c   |    2 +-\n builtin-tag.c            |    8 ++++----\n builtin-tar-tree.c       |    2 +-\n builtin-update-index.c   |    2 +-\n builtin-update-ref.c     |    4 ++--\n builtin-upload-archive.c |    6 +++---\n builtin-verify-tag.c     |    2 +-\n builtin-write-tree.c     |    2 +-\n daemon.c                 |    2 +-\n fast-import.c            |    2 +-\n git-am.sh                |    6 +++---\n git-archimport.perl      |    4 ++--\n git-cvsexportcommit.perl |    2 +-\n git-cvsimport.perl       |    2 +-\n git-cvsserver.perl       |    2 +-\n git-instaweb.sh          |    2 +-\n git-merge.sh             |    4 ++--\n git-pull.sh              |    2 +-\n git-quiltimport.sh       |    2 +-\n git-relink.perl          |    2 +-\n git-repack.sh            |    2 +-\n git-send-email.perl      |    2 +-\n git-sh-setup.sh          |    7 ++++---\n git-svn.perl             |    2 +-\n hash-object.c            |    2 +-\n help.c                   |    2 +-\n http-push.c              |    2 +-\n index-pack.c             |    2 +-\n pack-redundant.c         |    2 +-\n update-server-info.c     |    2 +-\n 80 files changed, 102 insertions(+), 101 deletions(-)\n\ndiff --git a/builtin-add.c b/builtin-add.c\nindex 9930cf5..bf13aa3 100644\n--- a/builtin-add.c\n+++ b/builtin-add.c\n@@ -16,7 +16,7 @@\n #include \"parse-options.h\"\n \n static const char * const builtin_add_usage[] = {\n-\t\"git-add [options] [--] <filepattern>...\",\n+\t\"git add [options] [--] <filepattern>...\",\n \tNULL\n };\n static int patch_interactive = 0, add_interactive = 0;\ndiff --git a/builtin-apply.c b/builtin-apply.c\nindex d13313f..e15471b 100644\n--- a/builtin-apply.c\n+++ b/builtin-apply.c\n@@ -46,7 +46,7 @@ static const char *fake_ancestor;\n static int line_termination = '\\n';\n static unsigned long p_context = ULONG_MAX;\n static const char apply_usage[] =\n-\"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|fix|error|error-all>] <patch>...\";\n+\"git apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|fix|error|error-all>] <patch>...\";\n \n static enum ws_error_action {\n \tnowarn_ws_error,\ndiff --git a/builtin-archive.c b/builtin-archive.c\nindex c2e0c1e..5cca460 100644\n--- a/builtin-archive.c\n+++ b/builtin-archive.c\n@@ -13,7 +13,7 @@\n #include \"attr.h\"\n \n static const char archive_usage[] = \\\n-\"git-archive --format=<fmt> [--prefix=<prefix>/] [--verbose] [<extra>] <tree-ish> [path...]\";\n+\"git archive --format=<fmt> [--prefix=<prefix>/] [--verbose] [<extra>] <tree-ish> [path...]\";\n \n static struct archiver_desc\n {\ndiff --git a/builtin-blame.c b/builtin-blame.c\nindex b451f6c..91850a5 100644\n--- a/builtin-blame.c\n+++ b/builtin-blame.c\n@@ -20,7 +20,7 @@\n #include \"mailmap.h\"\n \n static char blame_usage[] =\n-\"git-blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\\n\"\n+\"git blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\\n\"\n \"  -c                  Use the same output mode as git-annotate (Default: off)\\n\"\n \"  -b                  Show blank SHA-1 for boundary commits (Default: off)\\n\"\n \"  -l                  Show long commit SHA1 (Default: off)\\n\"\ndiff --git a/builtin-branch.c b/builtin-branch.c\nindex d279702..5cc3771 100644\n--- a/builtin-branch.c\n+++ b/builtin-branch.c\n@@ -15,10 +15,10 @@\n #include \"branch.h\"\n \n static const char * const builtin_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-\t\"git-branch [options] (-m | -M) [<oldbranch>] <newbranch>\",\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+\t\"git branch [options] (-m | -M) [<oldbranch>] <newbranch>\",\n \tNULL\n };\n \ndiff --git a/builtin-cat-file.c b/builtin-cat-file.c\nindex 880e75a..7441a56 100644\n--- a/builtin-cat-file.c\n+++ b/builtin-cat-file.c\n@@ -202,8 +202,8 @@ static int batch_objects(int print_contents)\n }\n \n static const char * const cat_file_usage[] = {\n-\t\"git-cat-file [-t|-s|-e|-p|<type>] <sha1>\",\n-\t\"git-cat-file [--batch|--batch-check] < <list_of_sha1s>\",\n+\t\"git cat-file [-t|-s|-e|-p|<type>] <sha1>\",\n+\t\"git cat-file [--batch|--batch-check] < <list_of_sha1s>\",\n \tNULL\n };\n \ndiff --git a/builtin-check-attr.c b/builtin-check-attr.c\nindex 6afdfa1..cb783fc 100644\n--- a/builtin-check-attr.c\n+++ b/builtin-check-attr.c\n@@ -4,7 +4,7 @@\n #include \"quote.h\"\n \n static const char check_attr_usage[] =\n-\"git-check-attr attr... [--] pathname...\";\n+\"git check-attr attr... [--] pathname...\";\n \n int cmd_check_attr(int argc, const char **argv, const char *prefix)\n {\ndiff --git a/builtin-checkout-index.c b/builtin-checkout-index.c\nindex eb1fc9a..71ebabf 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 }\n \n static const char checkout_cache_usage[] =\n-\"git-checkout-index [-u] [-q] [-a] [-f] [-n] [--stage=[123]|all] [--prefix=<string>] [--temp] [--] <file>...\";\n+\"git checkout-index [-u] [-q] [-a] [-f] [-n] [--stage=[123]|all] [--prefix=<string>] [--temp] [--] <file>...\";\n \n static struct lock_file lock_file;\n \ndiff --git a/builtin-clean.c b/builtin-clean.c\nindex 80a7ff9..48bf29f 100644\n--- a/builtin-clean.c\n+++ b/builtin-clean.c\n@@ -15,7 +15,7 @@\n static int force = -1; /* unset */\n \n static const char *const builtin_clean_usage[] = {\n-\t\"git-clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...\",\n+\t\"git clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...\",\n \tNULL\n };\n \ndiff --git a/builtin-clone.c b/builtin-clone.c\nindex ec36209..8112716 100644\n--- a/builtin-clone.c\n+++ b/builtin-clone.c\n@@ -29,7 +29,7 @@\n  *\n  */\n static const char * const builtin_clone_usage[] = {\n-\t\"git-clone [options] [--] <repo> [<dir>]\",\n+\t\"git clone [options] [--] <repo> [<dir>]\",\n \tNULL\n };\n \ndiff --git a/builtin-commit.c b/builtin-commit.c\nindex 745c11e..41cf5f2 100644\n--- a/builtin-commit.c\n+++ b/builtin-commit.c\n@@ -25,12 +25,12 @@\n #include \"unpack-trees.h\"\n \n static const char * const builtin_commit_usage[] = {\n-\t\"git-commit [options] [--] <filepattern>...\",\n+\t\"git commit [options] [--] <filepattern>...\",\n \tNULL\n };\n \n static const char * const builtin_status_usage[] = {\n-\t\"git-status [options] [--] <filepattern>...\",\n+\t\"git status [options] [--] <filepattern>...\",\n \tNULL\n };\n \ndiff --git a/builtin-config.c b/builtin-config.c\nindex 39f63d7..0cf191a 100644\n--- a/builtin-config.c\n+++ b/builtin-config.c\n@@ -3,7 +3,7 @@\n #include \"color.h\"\n \n static const char git_config_set_usage[] =\n-\"git-config [ --global | --system | [ -f | --file ] config-file ] [ --bool | --int | --bool-or-int ] [ -z | --null ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list | --get-color var [default] | --get-colorbool name [stdout-is-tty]\";\n+\"git config [ --global | --system | [ -f | --file ] config-file ] [ --bool | --int | --bool-or-int ] [ -z | --null ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list | --get-color var [default] | --get-colorbool name [stdout-is-tty]\";\n \n static char *key;\n static regex_t *key_regexp;\ndiff --git a/builtin-count-objects.c b/builtin-count-objects.c\nindex f00306f..91b5487 100644\n--- a/builtin-count-objects.c\n+++ b/builtin-count-objects.c\n@@ -67,7 +67,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,\n }\n \n static char const * const count_objects_usage[] = {\n-\t\"git-count-objects [-v]\",\n+\t\"git count-objects [-v]\",\n \tNULL\n };\n \ndiff --git a/builtin-describe.c b/builtin-describe.c\nindex e515f9c..5dabca9 100644\n--- a/builtin-describe.c\n+++ b/builtin-describe.c\n@@ -10,7 +10,7 @@\n #define MAX_TAGS\t(FLAG_BITS - 1)\n \n static const char * const describe_usage[] = {\n-\t\"git-describe [options] <committish>*\",\n+\t\"git describe [options] <committish>*\",\n \tNULL\n };\n \ndiff --git a/builtin-diff-files.c b/builtin-diff-files.c\nindex 384d871..9bf10bb 100644\n--- a/builtin-diff-files.c\n+++ b/builtin-diff-files.c\n@@ -10,7 +10,7 @@\n #include \"builtin.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 2f44ebf..17d851b 100644\n--- a/builtin-diff-index.c\n+++ b/builtin-diff-index.c\n@@ -5,7 +5,7 @@\n #include \"builtin.h\"\n \n static const char diff_cache_usage[] =\n-\"git-diff-index [-m] [--cached] \"\n+\"git diff-index [-m] [--cached] \"\n \"[<common diff options>] <tree-ish> [<path>...]\"\n COMMON_DIFF_OPTIONS_HELP;\n \ndiff --git a/builtin-diff-tree.c b/builtin-diff-tree.c\nindex 9d2a48f..415cb16 100644\n--- a/builtin-diff-tree.c\n+++ b/builtin-diff-tree.c\n@@ -53,7 +53,7 @@ static int diff_tree_stdin(char *line)\n }\n \n static const char diff_tree_usage[] =\n-\"git-diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] \"\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 \"  --root        include the initial commit as diff against /dev/null\\n\"\ndiff --git a/builtin-diff.c b/builtin-diff.c\nindex 4c289e7..faaa85a 100644\n--- a/builtin-diff.c\n+++ b/builtin-diff.c\n@@ -21,7 +21,7 @@ struct blobinfo {\n };\n \n static const char builtin_diff_usage[] =\n-\"git-diff <options> <rev>{0,2} -- <path>*\";\n+\"git diff <options> <rev>{0,2} -- <path>*\";\n \n static void stuff_change(struct diff_options *opt,\n \t\t\t unsigned old_mode, unsigned new_mode,\ndiff --git a/builtin-fast-export.c b/builtin-fast-export.c\nindex 75132ba..76f3167 100644\n--- a/builtin-fast-export.c\n+++ b/builtin-fast-export.c\n@@ -18,7 +18,7 @@\n #include \"parse-options.h\"\n \n static const char *fast_export_usage[] = {\n-\t\"git-fast-export [rev-list-opts]\",\n+\t\"git fast-export [rev-list-opts]\",\n \tNULL\n };\n \ndiff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c\nindex 1ea7040..273239a 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 };\n \n static const char 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+\"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 #define COMMON\t\t(1U << 1)\ndiff --git a/builtin-fetch.c b/builtin-fetch.c\nindex 97fdc51..61de50a 100644\n--- a/builtin-fetch.c\n+++ b/builtin-fetch.c\n@@ -12,7 +12,7 @@\n #include \"parse-options.h\"\n \n static const char * const builtin_fetch_usage[] = {\n-\t\"git-fetch [options] [<repository> <refspec>...]\",\n+\t\"git fetch [options] [<repository> <refspec>...]\",\n \tNULL\n };\n \ndiff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\nindex b892621..b34b01f 100644\n--- a/builtin-fmt-merge-msg.c\n+++ b/builtin-fmt-merge-msg.c\n@@ -6,7 +6,7 @@\n #include \"tag.h\"\n \n static const char *fmt_merge_msg_usage =\n-\t\"git-fmt-merge-msg [--log] [--no-log] [--file <file>]\";\n+\t\"git fmt-merge-msg [--log] [--no-log] [--file <file>]\";\n \n static int merge_summary;\n \ndiff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c\nindex fef93d7..76282ad 100644\n--- a/builtin-for-each-ref.c\n+++ b/builtin-for-each-ref.c\n@@ -831,7 +831,7 @@ 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-\t\"git-for-each-ref [options] [<pattern>]\",\n+\t\"git for-each-ref [options] [<pattern>]\",\n \tNULL\n };\n \ndiff --git a/builtin-fsck.c b/builtin-fsck.c\nindex b0f9648..7326dc3 100644\n--- a/builtin-fsck.c\n+++ b/builtin-fsck.c\n@@ -539,7 +539,7 @@ static int fsck_cache_tree(struct cache_tree *it)\n }\n \n static char const * const fsck_usage[] = {\n-\t\"git-fsck [options] [<object>...]\",\n+\t\"git fsck [options] [<object>...]\",\n \tNULL\n };\n \ndiff --git a/builtin-gc.c b/builtin-gc.c\nindex f5625bb..fac200e 100644\n--- a/builtin-gc.c\n+++ b/builtin-gc.c\n@@ -18,7 +18,7 @@\n #define FAILED_RUN \"failed to run %s\"\n \n static const char * const builtin_gc_usage[] = {\n-\t\"git-gc [options]\",\n+\t\"git gc [options]\",\n \tNULL\n };\n \ndiff --git a/builtin-grep.c b/builtin-grep.c\nindex ef29910..0cac395 100644\n--- a/builtin-grep.c\n+++ b/builtin-grep.c\n@@ -495,7 +495,7 @@ static int grep_object(struct grep_opt *opt, const char **paths,\n }\n \n static const char builtin_grep_usage[] =\n-\"git-grep <option>* <rev>* [-e] <pattern> [<path>...]\";\n+\"git grep <option>* <rev>* [-e] <pattern> [<path>...]\";\n \n static const char emsg_invalid_context_len[] =\n \"%s: invalid context length argument\";\ndiff --git a/builtin-init-db.c b/builtin-init-db.c\nindex e23b843..53aff68 100644\n--- a/builtin-init-db.c\n+++ b/builtin-init-db.c\n@@ -364,7 +364,7 @@ static int guess_repository_type(const char *git_dir)\n }\n \n static const char init_db_usage[] =\n-\"git-init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]]\";\n+\"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]]\";\n \n /*\n  * If you want to, you can share the DB area with any number of branches.\ndiff --git a/builtin-log.c b/builtin-log.c\nindex 430d876..cb3b33a 100644\n--- a/builtin-log.c\n+++ b/builtin-log.c\n@@ -1082,7 +1082,7 @@ static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)\n }\n \n static const char cherry_usage[] =\n-\"git-cherry [-v] <upstream> [<head>] [<limit>]\";\n+\"git cherry [-v] <upstream> [<head>] [<limit>]\";\n int cmd_cherry(int argc, const char **argv, const char *prefix)\n {\n \tstruct rev_info revs;\ndiff --git a/builtin-ls-files.c b/builtin-ls-files.c\nindex 75ba422..e8d568e 100644\n--- a/builtin-ls-files.c\n+++ b/builtin-ls-files.c\n@@ -423,7 +423,7 @@ int report_path_error(const char *ps_matched, const char **pathspec, int prefix_\n }\n \n static const char ls_files_usage[] =\n-\t\"git-ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* \"\n+\t\"git ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* \"\n \t\"[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] \"\n \t\"[ --exclude-per-directory=<filename> ] [--exclude-standard] \"\n \t\"[--full-name] [--abbrev] [--] [<file>]*\";\ndiff --git a/builtin-ls-remote.c b/builtin-ls-remote.c\nindex 06ab8da..c21b841 100644\n--- a/builtin-ls-remote.c\n+++ b/builtin-ls-remote.c\n@@ -4,7 +4,7 @@\n #include \"remote.h\"\n \n static const char ls_remote_usage[] =\n-\"git-ls-remote [--upload-pack=<git-upload-pack>] [<host>:]<directory>\";\n+\"git ls-remote [--upload-pack=<git-upload-pack>] [<host>:]<directory>\";\n \n /*\n  * Is there one among the list of patterns that match the tail part\ndiff --git a/builtin-ls-tree.c b/builtin-ls-tree.c\nindex f4a75dd..ac71358 100644\n--- a/builtin-ls-tree.c\n+++ b/builtin-ls-tree.c\n@@ -23,7 +23,7 @@ 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] [--abbrev[=<n>]] <tree-ish> [path...]\";\n+\t\"git ls-tree [-d] [-r] [-t] [-l] [-z] [--name-only] [--name-status] [--full-name] [--abbrev[=<n>]] <tree-ish> [path...]\";\n \n static int show_recursive(const char *base, int baselen, const char *pathname)\n {\ndiff --git a/builtin-mailinfo.c b/builtin-mailinfo.c\nindex fa6e8f9..b3d281e 100644\n--- a/builtin-mailinfo.c\n+++ b/builtin-mailinfo.c\n@@ -960,7 +960,7 @@ static int mailinfo(FILE *in, FILE *out, int ks, const char *encoding,\n }\n \n static const char mailinfo_usage[] =\n-\t\"git-mailinfo [-k] [-u | --encoding=<encoding>] msg patch <mail >info\";\n+\t\"git mailinfo [-k] [-u | --encoding=<encoding>] msg patch <mail >info\";\n \n int cmd_mailinfo(int argc, const char **argv, const char *prefix)\n {\ndiff --git a/builtin-mailsplit.c b/builtin-mailsplit.c\nindex ae2b4cb..0dc4cd9 100644\n--- a/builtin-mailsplit.c\n+++ b/builtin-mailsplit.c\n@@ -9,7 +9,7 @@\n #include \"path-list.h\"\n \n static const char git_mailsplit_usage[] =\n-\"git-mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> <mbox>|<Maildir>...\";\n+\"git mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> <mbox>|<Maildir>...\";\n \n static int is_from_line(const char *line, int len)\n {\ndiff --git a/builtin-merge-base.c b/builtin-merge-base.c\nindex bcf9395..1cb2925 100644\n--- a/builtin-merge-base.c\n+++ b/builtin-merge-base.c\n@@ -20,7 +20,7 @@ static int show_merge_base(struct commit *rev1, struct commit *rev2, int show_al\n }\n \n static const char merge_base_usage[] =\n-\"git-merge-base [--all] <commit-id> <commit-id>\";\n+\"git merge-base [--all] <commit-id> <commit-id>\";\n \n int cmd_merge_base(int argc, const char **argv, const char *prefix)\n {\ndiff --git a/builtin-mv.c b/builtin-mv.c\nindex 5530e11..ba9ceda 100644\n--- a/builtin-mv.c\n+++ b/builtin-mv.c\n@@ -11,7 +11,7 @@\n #include \"parse-options.h\"\n \n static const char * const builtin_mv_usage[] = {\n-\t\"git-mv [options] <source>... <destination>\",\n+\t\"git mv [options] <source>... <destination>\",\n \tNULL\n };\n \ndiff --git a/builtin-name-rev.c b/builtin-name-rev.c\nindex f153da0..85612c4 100644\n--- a/builtin-name-rev.c\n+++ b/builtin-name-rev.c\n@@ -172,7 +172,7 @@ static void show_name(const struct object *obj,\n }\n \n static char const * const name_rev_usage[] = {\n-\t\"git-name-rev [options] ( --all | --stdin | <commit>... )\",\n+\t\"git name-rev [options] ( --all | --stdin | <commit>... )\",\n \tNULL\n };\n \ndiff --git a/builtin-pack-refs.c b/builtin-pack-refs.c\nindex ff90aef..34246df 100644\n--- a/builtin-pack-refs.c\n+++ b/builtin-pack-refs.c\n@@ -3,7 +3,7 @@\n #include \"pack-refs.h\"\n \n static char const * const pack_refs_usage[] = {\n-\t\"git-pack-refs [options]\",\n+\t\"git pack-refs [options]\",\n \tNULL\n };\n \ndiff --git a/builtin-prune-packed.c b/builtin-prune-packed.c\nindex 241afbb..10cb8df 100644\n--- a/builtin-prune-packed.c\n+++ b/builtin-prune-packed.c\n@@ -3,7 +3,7 @@\n #include \"progress.h\"\n \n static const char prune_packed_usage[] =\n-\"git-prune-packed [-n] [-q]\";\n+\"git prune-packed [-n] [-q]\";\n \n #define DRY_RUN 01\n #define VERBOSE 02\ndiff --git a/builtin-prune.c b/builtin-prune.c\nindex bd3d2f6..7de4cab 100644\n--- a/builtin-prune.c\n+++ b/builtin-prune.c\n@@ -7,7 +7,7 @@\n #include \"parse-options.h\"\n \n static const char * const prune_usage[] = {\n-\t\"git-prune [-n] [--expire <time>] [--] [<head>...]\",\n+\t\"git prune [-n] [--expire <time>] [--] [<head>...]\",\n \tNULL\n };\n static int show_only;\ndiff --git a/builtin-push.c b/builtin-push.c\nindex b35aad6..03db28c 100644\n--- a/builtin-push.c\n+++ b/builtin-push.c\n@@ -10,7 +10,7 @@\n #include \"parse-options.h\"\n \n static const char * const push_usage[] = {\n-\t\"git-push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]\",\n+\t\"git push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]\",\n \tNULL,\n };\n \ndiff --git a/builtin-reflog.c b/builtin-reflog.c\nindex 125d455..0c34e37 100644\n--- a/builtin-reflog.c\n+++ b/builtin-reflog.c\n@@ -13,9 +13,9 @@\n  */\n \n static const char reflog_expire_usage[] =\n-\"git-reflog (show|expire) [--verbose] [--dry-run] [--stale-fix] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...\";\n+\"git reflog (show|expire) [--verbose] [--dry-run] [--stale-fix] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...\";\n static const char reflog_delete_usage[] =\n-\"git-reflog delete [--verbose] [--dry-run] [--rewrite] [--updateref] <refs>...\";\n+\"git reflog delete [--verbose] [--dry-run] [--rewrite] [--updateref] <refs>...\";\n \n static unsigned long default_reflog_expire;\n static unsigned long default_reflog_expire_unreachable;\n@@ -630,7 +630,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)\n  */\n \n static const char reflog_usage[] =\n-\"git-reflog (expire | ...)\";\n+\"git reflog (expire | ...)\";\n \n int cmd_reflog(int argc, const char **argv, const char *prefix)\n {\ndiff --git a/builtin-rerere.c b/builtin-rerere.c\nindex 839b26e..62ef7cf 100644\n--- a/builtin-rerere.c\n+++ b/builtin-rerere.c\n@@ -7,7 +7,7 @@\n #include <time.h>\n \n static const char git_rerere_usage[] =\n-\"git-rerere [clear | status | diff | gc]\";\n+\"git rerere [clear | status | diff | gc]\";\n \n /* these values are days */\n static int cutoff_noresolve = 15;\ndiff --git a/builtin-reset.c b/builtin-reset.c\nindex a032169..2e5a886 100644\n--- a/builtin-reset.c\n+++ b/builtin-reset.c\n@@ -20,8 +20,8 @@\n #include \"parse-options.h\"\n \n static const char * const git_reset_usage[] = {\n-\t\"git-reset [--mixed | --soft | --hard] [-q] [<commit>]\",\n-\t\"git-reset [--mixed] <commit> [--] <paths>...\",\n+\t\"git reset [--mixed | --soft | --hard] [-q] [<commit>]\",\n+\t\"git reset [--mixed] <commit> [--] <paths>...\",\n \tNULL\n };\n \ndiff --git a/builtin-rev-list.c b/builtin-rev-list.c\nindex 54b6672..114114b 100644\n--- a/builtin-rev-list.c\n+++ b/builtin-rev-list.c\n@@ -17,7 +17,7 @@\n #define COUNTED\t\t(1u<<16)\n \n static const char rev_list_usage[] =\n-\"git-rev-list [OPTION] <commit-id>... [ -- paths... ]\\n\"\n+\"git rev-list [OPTION] <commit-id>... [ -- paths... ]\\n\"\n \"  limiting output:\\n\"\n \"    --max-count=nr\\n\"\n \"    --max-age=epoch\\n\"\ndiff --git a/builtin-rev-parse.c b/builtin-rev-parse.c\nindex a7860ed..aa71f4a 100644\n--- a/builtin-rev-parse.c\n+++ b/builtin-rev-parse.c\n@@ -268,7 +268,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)\n {\n \tstatic int keep_dashdash = 0;\n \tstatic char const * const parseopt_usage[] = {\n-\t\t\"git-rev-parse --parseopt [options] -- [<args>...]\",\n+\t\t\"git rev-parse --parseopt [options] -- [<args>...]\",\n \t\tNULL\n \t};\n \tstatic struct option parseopt_opts[] = {\ndiff --git a/builtin-revert.c b/builtin-revert.c\nindex 0270f9b..ebfa3bb 100644\n--- a/builtin-revert.c\n+++ b/builtin-revert.c\n@@ -24,12 +24,12 @@\n  */\n \n static const char * const revert_usage[] = {\n-\t\"git-revert [options] <commit-ish>\",\n+\t\"git revert [options] <commit-ish>\",\n \tNULL\n };\n \n static const char * const cherry_pick_usage[] = {\n-\t\"git-cherry-pick [options] <commit-ish>\",\n+\t\"git cherry-pick [options] <commit-ish>\",\n \tNULL\n };\n \ndiff --git a/builtin-rm.c b/builtin-rm.c\nindex 22c9bd1..56454ec 100644\n--- a/builtin-rm.c\n+++ b/builtin-rm.c\n@@ -11,7 +11,7 @@\n #include \"parse-options.h\"\n \n static const char * const builtin_rm_usage[] = {\n-\t\"git-rm [options] [--] <file>...\",\n+\t\"git rm [options] [--] <file>...\",\n \tNULL\n };\n \ndiff --git a/builtin-send-pack.c b/builtin-send-pack.c\nindex a708d0a..7588d22 100644\n--- a/builtin-send-pack.c\n+++ b/builtin-send-pack.c\n@@ -8,7 +8,7 @@\n #include \"send-pack.h\"\n \n static const char send_pack_usage[] =\n-\"git-send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\\n\"\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 static struct send_pack_args args = {\ndiff --git a/builtin-shortlog.c b/builtin-shortlog.c\nindex e6a2865..fcb0da9 100644\n--- a/builtin-shortlog.c\n+++ b/builtin-shortlog.c\n@@ -9,7 +9,7 @@\n #include \"shortlog.h\"\n \n static const char shortlog_usage[] =\n-\"git-shortlog [-n] [-s] [-e] [-w] [<commit-id>... ]\";\n+\"git shortlog [-n] [-s] [-e] [-w] [<commit-id>... ]\";\n \n static int compare_by_number(const void *a1, const void *a2)\n {\ndiff --git a/builtin-show-branch.c b/builtin-show-branch.c\nindex 93047f5..233eed4 100644\n--- a/builtin-show-branch.c\n+++ b/builtin-show-branch.c\n@@ -4,7 +4,7 @@\n #include \"builtin.h\"\n \n static const char show_branch_usage[] =\n-\"git-show-branch [--sparse] [--current] [--all] [--remotes] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...] | --reflog[=n[,b]] <branch>\";\n+\"git show-branch [--sparse] [--current] [--all] [--remotes] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...] | --reflog[=n[,b]] <branch>\";\n static const char show_branch_usage_reflog[] =\n \"--reflog is incompatible with --all, --remotes, --independent or --merge-base\";\n \ndiff --git a/builtin-symbolic-ref.c b/builtin-symbolic-ref.c\nindex b49bdb6..bfc78bb 100644\n--- a/builtin-symbolic-ref.c\n+++ b/builtin-symbolic-ref.c\n@@ -4,7 +4,7 @@\n #include \"parse-options.h\"\n \n static const char * const git_symbolic_ref_usage[] = {\n-\t\"git-symbolic-ref [options] name [ref]\",\n+\t\"git symbolic-ref [options] name [ref]\",\n \tNULL\n };\n \ndiff --git a/builtin-tag.c b/builtin-tag.c\nindex 3c97c69..73cb7bf 100644\n--- a/builtin-tag.c\n+++ b/builtin-tag.c\n@@ -14,10 +14,10 @@\n #include \"parse-options.h\"\n \n static const char * const git_tag_usage[] = {\n-\t\"git-tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]\",\n-\t\"git-tag -d <tagname>...\",\n-\t\"git-tag -l [-n[<num>]] [<pattern>]\",\n-\t\"git-tag -v <tagname>...\",\n+\t\"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]\",\n+\t\"git tag -d <tagname>...\",\n+\t\"git tag -l [-n[<num>]] [<pattern>]\",\n+\t\"git tag -v <tagname>...\",\n \tNULL\n };\n \ndiff --git a/builtin-tar-tree.c b/builtin-tar-tree.c\nindex b04719e..f4bea4a 100644\n--- a/builtin-tar-tree.c\n+++ b/builtin-tar-tree.c\n@@ -8,7 +8,7 @@\n #include \"quote.h\"\n \n static const char tar_tree_usage[] =\n-\"git-tar-tree [--remote=<repo>] <tree-ish> [basedir]\\n\"\n+\"git tar-tree [--remote=<repo>] <tree-ish> [basedir]\\n\"\n \"*** Note that this command is now deprecated; use git-archive instead.\";\n \n int cmd_tar_tree(int argc, const char **argv, const char *prefix)\ndiff --git a/builtin-update-index.c b/builtin-update-index.c\nindex 9e0d7ab..38eb53c 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 }\n \n static const char 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+\"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 static unsigned char merge_head_sha1[20];\ndiff --git a/builtin-update-ref.c b/builtin-update-ref.c\nindex d90d11d..56a0b1b 100644\n--- a/builtin-update-ref.c\n+++ b/builtin-update-ref.c\n@@ -4,8 +4,8 @@\n #include \"parse-options.h\"\n \n static const char * const git_update_ref_usage[] = {\n-\t\"git-update-ref [options] -d <refname> [<oldval>]\",\n-\t\"git-update-ref [options]    <refname> <newval> [<oldval>]\",\n+\t\"git update-ref [options] -d <refname> [<oldval>]\",\n+\t\"git update-ref [options]    <refname> <newval> [<oldval>]\",\n \tNULL\n };\n \ndiff --git a/builtin-upload-archive.c b/builtin-upload-archive.c\nindex 371400d..6438133 100644\n--- a/builtin-upload-archive.c\n+++ b/builtin-upload-archive.c\n@@ -8,13 +8,13 @@\n #include \"sideband.h\"\n \n static const char upload_archive_usage[] =\n-\t\"git-upload-archive <repo>\";\n+\t\"git upload-archive <repo>\";\n \n static const char deadchild[] =\n-\"git-upload-archive: archiver died with error\";\n+\"git upload-archive: archiver died with error\";\n \n static const char lostchild[] =\n-\"git-upload-archive: archiver process was lost\";\n+\"git upload-archive: archiver process was lost\";\n \n \n static int run_upload_archive(int argc, const char **argv, const char *prefix)\ndiff --git a/builtin-verify-tag.c b/builtin-verify-tag.c\nindex 92eaa89..7d837f0 100644\n--- a/builtin-verify-tag.c\n+++ b/builtin-verify-tag.c\n@@ -12,7 +12,7 @@\n #include <signal.h>\n \n static const char builtin_verify_tag_usage[] =\n-\t\t\"git-verify-tag [-v|--verbose] <tag>...\";\n+\t\t\"git verify-tag [-v|--verbose] <tag>...\";\n \n #define PGP_SIGNATURE \"-----BEGIN PGP SIGNATURE-----\"\n \ndiff --git a/builtin-write-tree.c b/builtin-write-tree.c\nindex c218799..52a3c01 100644\n--- a/builtin-write-tree.c\n+++ b/builtin-write-tree.c\n@@ -9,7 +9,7 @@\n #include \"cache-tree.h\"\n \n static const char write_tree_usage[] =\n-\"git-write-tree [--missing-ok] [--prefix=<prefix>/]\";\n+\"git write-tree [--missing-ok] [--prefix=<prefix>/]\";\n \n int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)\n {\ndiff --git a/daemon.c b/daemon.c\nindex ce3a6f5..7df41a6 100644\n--- a/daemon.c\n+++ b/daemon.c\n@@ -18,7 +18,7 @@ static int verbose;\n static int reuseaddr;\n \n static const char daemon_usage[] =\n-\"git-daemon [--verbose] [--syslog] [--export-all]\\n\"\n+\"git daemon [--verbose] [--syslog] [--export-all]\\n\"\n \"           [--timeout=n] [--init-timeout=n] [--strict-paths]\\n\"\n \"           [--base-path=path] [--base-path-relaxed]\\n\"\n \"           [--user-path | --user-path=path]\\n\"\ndiff --git a/fast-import.c b/fast-import.c\nindex e72b286..c4d054e 100644\n--- a/fast-import.c\n+++ b/fast-import.c\n@@ -2374,7 +2374,7 @@ static int git_pack_config(const char *k, const char *v, void *cb)\n }\n \n static const char fast_import_usage[] =\n-\"git-fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]\";\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 {\ndiff --git a/git-am.sh b/git-am.sh\nindex 2c517ed..14578ce 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -5,9 +5,9 @@\n SUBDIRECTORY_OK=Yes\n OPTIONS_KEEPDASHDASH=\n OPTIONS_SPEC=\"\\\n-git-am [options] <mbox>|<Maildir>...\n-git-am [options] --resolved\n-git-am [options] --skip\n+git am [options] <mbox>|<Maildir>...\n+git am [options] --resolved\n+git am [options] --skip\n --\n d,dotest=       (removed -- do not use)\n i,interactive   run interactively\ndiff --git a/git-archimport.perl b/git-archimport.perl\nindex 9a7a906..98f3ede 100755\n--- a/git-archimport.perl\n+++ b/git-archimport.perl\n@@ -9,7 +9,7 @@\n \n =head1 Invocation\n \n-    git-archimport [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]\n+    git archimport [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]\n \t[ -D depth] [ -t tempdir ] <archive>/<branch> [ <archive>/<branch> ]\n \n Imports a project from one or more Arch repositories. It will follow branches\n@@ -74,7 +74,7 @@ our($opt_h,$opt_f,$opt_v,$opt_T,$opt_t,$opt_D,$opt_a,$opt_o);\n \n sub usage() {\n     print STDERR <<END;\n-Usage: ${\\basename $0}     # fetch/update GIT from Arch\n+Usage: git archimport     # fetch/update GIT from Arch\n        [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] [ -D depth ] [ -t tempdir ]\n        repository/arch-branch [ repository/arch-branch] ...\n END\ndiff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl\nindex c6c70e9..6d9f0ef 100755\n--- a/git-cvsexportcommit.perl\n+++ b/git-cvsexportcommit.perl\n@@ -370,7 +370,7 @@ sleep(1);\n \n sub usage {\n \tprint STDERR <<END;\n-Usage: GIT_DIR=/path/to/.git ${\\basename $0} [-h] [-p] [-v] [-c] [-f] [-u] [-w cvsworkdir] [-m msgprefix] [ parent ] commit\n+Usage: GIT_DIR=/path/to/.git git cvsexportcommit [-h] [-p] [-v] [-c] [-f] [-u] [-w cvsworkdir] [-m msgprefix] [ parent ] commit\n END\n \texit(1);\n }\ndiff --git a/git-cvsimport.perl b/git-cvsimport.perl\nindex cacbfc0..e2664ef 100755\n--- a/git-cvsimport.perl\n+++ b/git-cvsimport.perl\n@@ -36,7 +36,7 @@ sub usage(;$) {\n \tmy $msg = shift;\n \tprint(STDERR \"Error: $msg\\n\") if $msg;\n \tprint STDERR <<END;\n-Usage: ${\\basename $0}     # fetch/update GIT from CVS\n+Usage: git cvsimport     # fetch/update GIT from CVS\n        [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file]\n        [-p opts-for-cvsps] [-P file] [-C GIT_repository] [-z fuzz] [-i] [-k]\n        [-u] [-s subst] [-a] [-m] [-M regex] [-S regex] [-L commitlimit]\ndiff --git a/git-cvsserver.perl b/git-cvsserver.perl\nindex 920bbe1..d2d374a 100755\n--- a/git-cvsserver.perl\n+++ b/git-cvsserver.perl\n@@ -101,7 +101,7 @@ my $work =\n $log->info(\"--------------- STARTING -----------------\");\n \n my $usage =\n-    \"Usage: git-cvsserver [options] [pserver|server] [<directory> ...]\\n\".\n+    \"Usage: git cvsserver [options] [pserver|server] [<directory> ...]\\n\".\n     \"    --base-path <path>  : Prepend to requested CVSROOT\\n\".\n     \"    --strict-paths      : Don't allow recursing into subdirectories\\n\".\n     \"    --export-all        : Don't check for gitcvs.enabled in config\\n\".\ndiff --git a/git-instaweb.sh b/git-instaweb.sh\nindex af0fde5..0843372 100755\n--- a/git-instaweb.sh\n+++ b/git-instaweb.sh\n@@ -6,7 +6,7 @@\n PERL='@@PERL@@'\n OPTIONS_KEEPDASHDASH=\n OPTIONS_SPEC=\"\\\n-git-instaweb [options] (--start | --stop | --restart)\n+git instaweb [options] (--start | --stop | --restart)\n --\n l,local        only bind on 127.0.0.1\n p,port=        the port to bind to\ndiff --git a/git-merge.sh b/git-merge.sh\nindex 8026ccf..e9588ee 100755\n--- a/git-merge.sh\n+++ b/git-merge.sh\n@@ -5,8 +5,8 @@\n \n OPTIONS_KEEPDASHDASH=\n OPTIONS_SPEC=\"\\\n-git-merge [options] <remote>...\n-git-merge [options] <msg> HEAD <remote>\n+git merge [options] <remote>...\n+git merge [options] <msg> HEAD <remote>\n --\n stat                 show a diffstat at the end of the merge\n n                    don't show a diffstat at the end of the merge\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 809e537..6afd4e2 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -121,7 +121,7 @@ test true = \"$rebase\" && {\n \t\t\"refs/remotes/$origin/$reflist\" 2>/dev/null)\"\n }\n orig_head=$(git rev-parse --verify HEAD 2>/dev/null)\n-git-fetch --update-head-ok \"$@\" || exit 1\n+git fetch --update-head-ok \"$@\" || exit 1\n \n curr_head=$(git rev-parse --verify HEAD 2>/dev/null)\n if test \"$curr_head\" != \"$orig_head\"\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex 7cd8f71..e0649cd 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -1,7 +1,7 @@\n #!/bin/sh\n OPTIONS_KEEPDASHDASH=\n OPTIONS_SPEC=\"\\\n-git-quiltimport [options]\n+git quiltimport [options]\n --\n n,dry-run     dry run\n author=       author name and email address for patches without any\ndiff --git a/git-relink.perl b/git-relink.perl\nindex 15fb932..937c69a 100755\n--- a/git-relink.perl\n+++ b/git-relink.perl\n@@ -163,7 +163,7 @@ sub link_two_files($$) {\n \n \n sub usage() {\n-\tprint(\"Usage: $0 [--safe] <dir> [<dir> ...] <master_dir> \\n\");\n+\tprint(\"Usage: git relink [--safe] <dir> [<dir> ...] <master_dir> \\n\");\n \tprint(\"All directories should contain a .git/objects/ subdirectory.\\n\");\n \tprint(\"Options\\n\");\n \tprint(\"\\t--safe\\t\" .\ndiff --git a/git-repack.sh b/git-repack.sh\nindex 8c3bc13..683960b 100755\n--- a/git-repack.sh\n+++ b/git-repack.sh\n@@ -5,7 +5,7 @@\n \n OPTIONS_KEEPDASHDASH=\n OPTIONS_SPEC=\"\\\n-git-repack [options]\n+git repack [options]\n --\n a               pack everything in a single pack\n A               same as -a, and turn unreachable objects loose\ndiff --git a/git-send-email.perl b/git-send-email.perl\nindex 6adb669..2e4a44a 100755\n--- a/git-send-email.perl\n+++ b/git-send-email.perl\n@@ -38,7 +38,7 @@ package main;\n \n sub usage {\n \tprint <<EOT;\n-git-send-email [options] <file | directory>...\n+git send-email [options] <file | directory>...\n Options:\n    --from         Specify the \"From:\" line of the email to be sent.\n \ndiff --git a/git-sh-setup.sh b/git-sh-setup.sh\nindex 9cceb21..dbdf209 100755\n--- a/git-sh-setup.sh\n+++ b/git-sh-setup.sh\n@@ -32,15 +32,16 @@ if test -n \"$OPTIONS_SPEC\"; then\n \t\techo exit $?\n \t)\"\n else\n+\tdashless=$(basename \"$0\" | sed -e 's/-/ /')\n \tusage() {\n-\t\tdie \"Usage: $0 $USAGE\"\n+\t\tdie \"Usage: $dashless $USAGE\"\n \t}\n \n \tif [ -z \"$LONG_USAGE\" ]\n \tthen\n-\t\tLONG_USAGE=\"Usage: $0 $USAGE\"\n+\t\tLONG_USAGE=\"Usage: $dashless $USAGE\"\n \telse\n-\t\tLONG_USAGE=\"Usage: $0 $USAGE\n+\t\tLONG_USAGE=\"Usage: $dashless $USAGE\n \n $LONG_USAGE\"\n \tfi\ndiff --git a/git-svn.perl b/git-svn.perl\nindex a366c89..f6b878a 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -261,7 +261,7 @@ sub usage {\n \tmy $fd = $exit ? \\*STDERR : \\*STDOUT;\n \tprint $fd <<\"\";\n git-svn - bidirectional operations between a single Subversion tree and git\n-Usage: $0 <command> [options] [arguments]\\n\n+Usage: git svn <command> [options] [arguments]\\n\n \n \tprint $fd \"Available commands:\\n\" unless $cmd;\n \ndiff --git a/hash-object.c b/hash-object.c\nindex 48d5223..46c06a9 100644\n--- a/hash-object.c\n+++ b/hash-object.c\n@@ -52,7 +52,7 @@ static void hash_stdin_paths(const char *type, int write_objects)\n }\n \n static const char hash_object_usage[] =\n-\"git-hash-object [ [-t <type>] [-w] [--stdin] <file>... | --stdin-paths < <list-of-paths> ]\";\n+\"git hash-object [ [-t <type>] [-w] [--stdin] <file>... | --stdin-paths < <list-of-paths> ]\";\n \n int main(int argc, char **argv)\n {\ndiff --git a/help.c b/help.c\nindex ca9632b..ee15955 100644\n--- a/help.c\n+++ b/help.c\n@@ -40,7 +40,7 @@ static struct option builtin_help_options[] = {\n };\n \n static const char * const builtin_help_usage[] = {\n-\t\"git-help [--all] [--man|--web|--info] [command]\",\n+\t\"git help [--all] [--man|--web|--info] [command]\",\n \tNULL\n };\n \ndiff --git a/http-push.c b/http-push.c\nindex 2cd068a..6805288 100644\n--- a/http-push.c\n+++ b/http-push.c\n@@ -14,7 +14,7 @@\n #include <expat.h>\n \n static const char http_push_usage[] =\n-\"git-http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\\n\";\n+\"git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\\n\";\n \n #ifndef XML_STATUS_OK\n enum XML_Status {\ndiff --git a/index-pack.c b/index-pack.c\nindex 25db5db..bb2e6a3 100644\n--- a/index-pack.c\n+++ b/index-pack.c\n@@ -10,7 +10,7 @@\n #include \"fsck.h\"\n \n static const char index_pack_usage[] =\n-\"git-index-pack [-v] [-o <index-file>] [{ ---keep | --keep=<msg> }] [--strict] { <pack-file> | --stdin [--fix-thin] [<pack-file>] }\";\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 {\ndiff --git a/pack-redundant.c b/pack-redundant.c\nindex f5cd0ac..25b81a4 100644\n--- a/pack-redundant.c\n+++ b/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 | <.pack filename> ...>\";\n \n static int load_all_packs, verbose, alt_odb;\n \ndiff --git a/update-server-info.c b/update-server-info.c\nindex 0b6c383..7e8209e 100644\n--- a/update-server-info.c\n+++ b/update-server-info.c\n@@ -1,7 +1,7 @@\n #include \"cache.h\"\n \n static const char update_server_info_usage[] =\n-\"git-update-server-info [--force]\";\n+\"git update-server-info [--force]\";\n \n int main(int ac, char **av)\n {\n-- \n1.5.6.2.306.gcc0c\n"}]}