Cumulative update of merge-recursive in C

diff --git a/run-command.h b/run-command.h
index 2469eeaefbc19424d5ec61f173cc17b68a183bc5..70b477a7483ce3a4997b20ee02223eeb483bde6c 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -12,9 +12,9 @@ enum {
 };
 
 #define RUN_COMMAND_NO_STDIO 1
-
-int run_command_v_opt(int argc, char **argv, int opt);
-int run_command_v(int argc, char **argv);
+#define RUN_GIT_CMD         2  /*If this is to be git sub-command */
+int run_command_v_opt(int argc, const char **argv, int opt);
+int run_command_v(int argc, const char **argv);
 int run_command(const char *cmd, ...);
 
 #endif