Merge branch 'jc/combine' into next

diff --git a/git.c b/git.c
index 72039c69cbd08dc70bd611765039883182472191..b4a1ef2bc85a79cd0d6f7c8fe3ed0eba9fd1f062 100644 (file)
--- a/git.c
+++ b/git.c
@@ -172,7 +172,7 @@ static void list_commands(const char *exec_path, const char *pattern)
        putchar('\n');
 }
 
-static void list_common_cmds_help()
+static void list_common_cmds_help(void)
 {
        int i, longest = 0;