summaryrefslogtreecommitdiff
path: root/merge-base.c
diff options
context:
space:
mode:
authorAlexey Nezhdanov <snake@penza-gsm.ru>2005-05-19 11:17:16 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 17:52:00 (GMT)
commit667bb59b2d5b0a2e7fca5970d6f757790a6edd74 (patch)
tree099b568160ec8ad8cbae5c22b61abe69a82d6546 /merge-base.c
parent9669e17a2f79e8ef0bd5981f8178cada5e53d46b (diff)
downloadgit-667bb59b2d5b0a2e7fca5970d6f757790a6edd74.zip
git-667bb59b2d5b0a2e7fca5970d6f757790a6edd74.tar.gz
git-667bb59b2d5b0a2e7fca5970d6f757790a6edd74.tar.bz2
[PATCH] cleanup of in-code names
Fixes all in-code names that leaved during "big name change". Signed-off-by: Alexey Nezhdanov <snake@penza-gsm.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'merge-base.c')
-rw-r--r--merge-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-base.c b/merge-base.c
index 6aa7f56..04f40fc 100644
--- a/merge-base.c
+++ b/merge-base.c
@@ -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);