Merge branch 'maint'

diff --git a/builtin-annotate.c b/builtin-annotate.c
index 57c46840d542f31dd4e42455140fc901f1eeb671..9db7cfe74c7a8583995e6c20c4eedebf58391fbc 100644 (file)
--- a/builtin-annotate.c
+++ b/builtin-annotate.c
@@ -12,7 +12,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix)
        int i;
        nargv = xmalloc(sizeof(char *) * (argc + 2));
 
-       nargv[0] = "blame";
+       nargv[0] = "annotate";
        nargv[1] = "-c";
 
        for (i = 1; i < argc; i++) {