Allow the user to control the verbosity of merge-recursive.

diff --git a/run-command.h b/run-command.h
index 4f646139e5386d6f34d6cd777473876e17ab8d66..59c4476ced789441eea3f68bfc7377e7e15e9b14 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -11,6 +11,12 @@ enum {
        ERR_RUN_COMMAND_WAITPID_NOEXIT,
 };
 
+#define RUN_COMMAND_NO_STDIN 1
+#define RUN_GIT_CMD         2  /*If this is to be git sub-command */
+#define RUN_COMMAND_STDOUT_TO_STDERR 4
+int run_command_v_opt(const char **argv, int opt);
+int run_command_v(const char **argv);
+int run_command_opt(int opt, const char *cmd, ...);
 int run_command(const char *cmd, ...);
 
 #endif