X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-index.c;h=aa9cf23a39ae271a53d1a0c05ac99be0e832b46a;hb=b19293df9e84ed056bc984aa7ef716689b58b0b1;hp=7827e87a928586226570132fc8922991b1cb6c8a;hpb=39a76bdd7de18b2bb2651dcb8136563df41e84f7;p=git.git diff --git a/merge-index.c b/merge-index.c index 7827e87a9..aa9cf23a3 100644 --- a/merge-index.c +++ b/merge-index.c @@ -1,5 +1,6 @@ #include "cache.h" #include "run-command.h" +#include "exec_cmd.h" static const char *pgm; static const char *arguments[9]; @@ -91,7 +92,9 @@ int main(int argc, char **argv) signal(SIGCHLD, SIG_DFL); if (argc < 3) - usage("git-merge-index [-o] [-q] (-a | [--] *)"); + usage("git merge-index [-o] [-q] (-a | [--] *)"); + + git_extract_argv0_path(argv[0]); setup_git_directory(); read_cache();