diff options
| -rw-r--r-- | builtin/rebase.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 36490d06c8..81c8926a56 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1159,11 +1159,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) } else { strbuf_reset(&buf); strbuf_addf(&buf, "%s/interactive", merge_dir()); - if(file_exists(buf.buf)) { - options.type = REBASE_MERGE; + options.type = REBASE_MERGE; + if (file_exists(buf.buf)) options.flags |= REBASE_INTERACTIVE_EXPLICIT; - } else - options.type = REBASE_MERGE; } options.state_dir = merge_dir(); } |