aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge-base.c
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2008-07-13 15:36:15 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-13 14:12:48 -0700
commit1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d (patch)
tree6eb5a6d6bd6e5a6db54f1a43ab7931a196f4f814 /builtin-merge-base.c
parentd492b31cafe9aa5ce001b1d48815f4c0bb40d01a (diff)
downloadgit-1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d.tar.gz
git-1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d.tar.xz
Make usage strings dash-less
When you misuse a git command, you are shown the usage string. But this is currently shown in the dashed form. So if you just copy what you see, it will not work, when the dashed form is no longer supported. This patch makes git commands show the dash-less version. For shell scripts that do not specify OPTIONS_SPEC, git-sh-setup.sh generates a dash-less usage string now. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-base.c')
-rw-r--r--builtin-merge-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge-base.c b/builtin-merge-base.c
index bcf9395aa..1cb2925d2 100644
--- a/builtin-merge-base.c
+++ b/builtin-merge-base.c
@@ -20,7 +20,7 @@ static int show_merge_base(struct commit *rev1, struct commit *rev2, int show_al
}
static const char merge_base_usage[] =
-"git-merge-base [--all] <commit-id> <commit-id>";
+"git merge-base [--all] <commit-id> <commit-id>";
int cmd_merge_base(int argc, const char **argv, const char *prefix)
{