rebase --rebase-merges: root commits can be cousins, too

diff --git a/builtin/blame.c b/builtin/blame.c
index f1a2fd67029e6980d317da5136aece233ba192f1..db38c0b307c5719ab3bd5e6b8597ec8810c0de3d 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -729,6 +729,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
        for (;;) {
                switch (parse_options_step(&ctx, options, blame_opt_usage)) {
                case PARSE_OPT_HELP:
+               case PARSE_OPT_ERROR:
                        exit(129);
                case PARSE_OPT_DONE:
                        if (ctx.argv[0])