summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rebase.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index a11e15b86f..f82fe10878 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -130,6 +130,12 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
parse_strategy_opts(&replay, strategy_buf.buf);
strbuf_release(&strategy_buf);
+
+ if (opts->squash_onto) {
+ oidcpy(&replay.squash_onto, opts->squash_onto);
+ replay.have_squash_onto = 1;
+ }
+
return replay;
}