am: suppress apply errors when using 3-way

diff --git a/builtin-reset.c b/builtin-reset.c
index 7e7ebabaa865ebd749502774638efe7b6d26bec1..5fa1789d0c2b90ef9ee83d091b67292f2ff0db26 100644 (file)
--- a/builtin-reset.c
+++ b/builtin-reset.c
@@ -203,7 +203,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 
        git_config(git_default_config, NULL);
 
-       argc = parse_options(argc, argv, options, git_reset_usage,
+       argc = parse_options(argc, argv, prefix, options, git_reset_usage,
                                                PARSE_OPT_KEEP_DASHDASH);
        reflog_action = args_to_str(argv);
        setenv("GIT_REFLOG_ACTION", reflog_action, 0);