diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:22:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:22:50 -0700 |
commit | 588c038ac690e012a00dcace34fb318449f5ec7c (patch) | |
tree | d604d58fdb9d655e784d30b28b157e01eb289621 /builtin-init-db.c | |
parent | e75bf76f5462af4185d8260f6feecf24dd24a516 (diff) | |
parent | 1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d (diff) | |
download | git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.gz git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.xz |
Merge branch 'sb/dashless'
* sb/dashless:
Make usage strings dash-less
t/: Use "test_must_fail git" instead of "! git"
t/test-lib.sh: exit with small negagive int is ok with test_must_fail
Conflicts:
builtin-blame.c
builtin-mailinfo.c
builtin-mailsplit.c
builtin-shortlog.c
git-am.sh
t/t4150-am.sh
t/t4200-rerere.sh
Diffstat (limited to 'builtin-init-db.c')
-rw-r--r-- | builtin-init-db.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-init-db.c b/builtin-init-db.c index 5ba213a59..38b4fcb6d 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -354,7 +354,7 @@ static int guess_repository_type(const char *git_dir) } static const char init_db_usage[] = -"git-init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]]"; +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]]"; /* * If you want to, you can share the DB area with any number of branches. |