X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=merge-base.c;h=12ebb95fba51ee9bba9767b25c999bd3de9ebd94;hb=000182eacf99cde27d5916aa415921924b82972c;hp=6aa7f56526132dc0294717a3d3066ff568c33c38;hpb=9b632be30c72f25ac180fa2bf7286505c87e46d2;p=git.git

diff --git a/merge-base.c b/merge-base.c
index 6aa7f565..12ebb95f 100644
--- a/merge-base.c
+++ b/merge-base.c
@@ -15,7 +15,7 @@ static struct commit *process_list(struct commit_list **list_p, int this_mark,
 	return NULL;
 }
 
-struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
+static struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
 {
 	struct commit_list *rev1list = NULL;
 	struct commit_list *rev2list = NULL;
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
 	if (argc != 3 ||
 	    get_sha1(argv[1], rev1key) ||
 	    get_sha1(argv[2], rev2key)) {
-		usage("merge-base <commit-id> <commit-id>");
+		usage("git-merge-base <commit-id> <commit-id>");
 	}
 	rev1 = lookup_commit_reference(rev1key);
 	rev2 = lookup_commit_reference(rev2key);