Merge branch 'maint'

diff --git a/run-command.h b/run-command.h
index 4f2b7d7d403ee6d87fea5ba2dc32da7596965e5e..a8b0c209e9b7487ce3c2b214cbebe7ad4f97fd11 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -53,7 +53,6 @@ int run_command(struct child_process *);
 #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_opt_cd(const char **argv, int opt, const char *dir);
 
 /*
  * env (the environment) is to be formatted like environ: "VAR=VALUE".