diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-17 00:22:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-17 00:22:50 (GMT) |
| commit | 588c038ac690e012a00dcace34fb318449f5ec7c (patch) | |
| tree | d604d58fdb9d655e784d30b28b157e01eb289621 /builtin-merge-base.c | |
| parent | e75bf76f5462af4185d8260f6feecf24dd24a516 (diff) | |
| parent | 1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d (diff) | |
| download | git-588c038ac690e012a00dcace34fb318449f5ec7c.zip git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.gz git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.bz2 | |
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-merge-base.c')
| -rw-r--r-- | builtin-merge-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge-base.c b/builtin-merge-base.c index bcf9395..1cb2925 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) { |