Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-am: Mention --abort in usage string part of OPTIONS_SPEC
[gitweb.git]
/
builtin-merge-base.c
diff --git
a/builtin-merge-base.c
b/builtin-merge-base.c
index bcf9395aafb475edd22459eaf05cf5e180ca9b8f..1cb2925d2f3dc6dc1a38c31bcec1c10ae8146a22 100644
(file)
--- 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)
{