rebase: Allow merge strategies to be used when rebasing

diff --git a/run-command.h b/run-command.h
index 5ee0972241030d2f6d87a465c4726e6cc3ab803a..70b477a7483ce3a4997b20ee02223eeb483bde6c 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -11,7 +11,10 @@ enum {
        ERR_RUN_COMMAND_WAITPID_NOEXIT,
 };
 
-int run_command_v(int argc, char **argv);
+#define RUN_COMMAND_NO_STDIO 1
+#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