Merge branch 'js/read-tree' into js/c-merge-recursive

[git.git] / builtin-help.c

diff --git a/builtin-help.c b/builtin-help.c
index bc1b4da3bc0186487fac40173203cac91c1e3710..bb0b03f1ae64cc5f4fa1376169c27b8a7cb71734 100644 (file)
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -221,13 +221,13 @@ static void show_man_page(const char *git_cmd)
        execlp("man", "man", page, NULL);
 }
 
-int cmd_version(int argc, const char **argv, char **envp)
+int cmd_version(int argc, const char **argv, const char *prefix)
 {
        printf("git version %s\n", git_version_string);
        return 0;
 }
 
-int cmd_help(int argc, const char **argv, char **envp)
+int cmd_help(int argc, const char **argv, const char *prefix)
 {
        const char *help_cmd = argc > 1 ? argv[1] : NULL;
        if (!help_cmd)