subtree: improve decision on merges kept in split

diff --git a/exec-cmd.h b/exec-cmd.h
index ff0b48048a6ba82827b4d441654c34c21cfb7b9a..2522453cdaa74d9e9d806f20036518a394dd32e2 100644 (file)
--- a/exec-cmd.h
+++ b/exec-cmd.h
@@ -3,8 +3,8 @@
 
 struct argv_array;
 
-extern void git_set_argv_exec_path(const char *exec_path);
-extern void git_extract_argv0_path(const char *path);
+extern void git_set_exec_path(const char *exec_path);
+extern void git_resolve_executable_dir(const char *path);
 extern const char *git_exec_path(void);
 extern void setup_path(void);
 extern const char **prepare_git_cmd(struct argv_array *out, const char **argv);