Merge branch 'vv/merge-squash-with-explicit-commit' into maint

diff --git a/parse-options.h b/parse-options.h
index 98ea42ffd9ecd977b655143651359bf1859eba2a..ac6ba8abf9ec7af1712486ecfe3e397359c4a67f 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -292,7 +292,9 @@ int parse_opt_commit(const struct option *, const char *, int);
 int parse_opt_tertiary(const struct option *, const char *, int);
 int parse_opt_string_list(const struct option *, const char *, int);
 int parse_opt_noop_cb(const struct option *, const char *, int);
-int parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx, const struct option *, const char *, int);
+enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx,
+                                          const struct option *,
+                                          const char *, int);
 int parse_opt_passthru(const struct option *, const char *, int);
 int parse_opt_passthru_argv(const struct option *, const char *, int);