rebase-interactive: append_todo_help() changes

diff --git a/parse-options.h b/parse-options.h
index 6c4fe2016d65f1093400f8f5080085eb244f0026..81380c22b62e3b55187705010fe459a795df1b0d 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -186,10 +186,7 @@ extern NORETURN void usage_msg_opt(const char *msg,
                                   const struct option *options);
 
 extern int optbug(const struct option *opt, const char *reason);
-extern int opterror(const struct option *opt, const char *reason, int flags);
-#if defined(__GNUC__)
-#define opterror(o,r,f) (opterror((o),(r),(f)), const_error())
-#endif
+const char *optname(const struct option *opt, int flags);
 
 /*
  * Use these assertions for callbacks that expect to be called with NONEG and
@@ -208,6 +205,7 @@ extern int opterror(const struct option *opt, const char *reason, int flags);
 /*----- incremental advanced APIs -----*/
 
 enum {
+       PARSE_OPT_COMPLETE = -2,
        PARSE_OPT_HELP = -1,
        PARSE_OPT_DONE,
        PARSE_OPT_NON_OPTION,