git-rebase: error out when incompatible options passed

diff --git a/parse-options.h b/parse-options.h
index ab1cc362bf2918c28a14dd851c1b1a13dfa0c863..dd14911a297a5b10705ecb31243c55a7dc2f193c 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -200,6 +200,7 @@ enum {
        PARSE_OPT_HELP = -1,
        PARSE_OPT_DONE,
        PARSE_OPT_NON_OPTION,
+       PARSE_OPT_ERROR,
        PARSE_OPT_UNKNOWN
 };