Use "git merge" instead of "git pull ."

diff --git a/run-command.h b/run-command.h
index 0a47679c42f9d5b0d1a55efd0bb25c866fba8253..6b985afd07a5b58ecadad8859ae90b3430ccb4c2 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -46,7 +46,7 @@ int finish_command(struct child_process *);
 int run_command(struct child_process *);
 
 extern char *find_hook(const char *name);
-__attribute__((sentinel))
+LAST_ARG_MUST_BE_NULL
 extern int run_hook(const char *index_file, const char *name, ...);
 
 #define RUN_COMMAND_NO_STDIN 1