Merge branch 'gv/p4-multi-path-commit-fix' into maint

diff --git a/parse-options.h b/parse-options.h
index 78f8384c56b02cbabcc586b3ee082cb1cb12e764..dcd8a0926cc9c18fd49d800bc83064259eced279 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -228,6 +228,7 @@ extern int parse_opt_commits(const struct option *, const char *, int);
 extern int parse_opt_tertiary(const struct option *, const char *, int);
 extern int parse_opt_string_list(const struct option *, const char *, int);
 extern int parse_opt_noop_cb(const struct option *, const char *, int);
+extern int parse_opt_unknown_cb(const struct option *, const char *, int);
 extern int parse_opt_passthru(const struct option *, const char *, int);
 extern int parse_opt_passthru_argv(const struct option *, const char *, int);