broken out of the bigger series, as the aggregation just unnecessarily holds it up. v3: removed "stray" footer. so more of a RESEND than an actual new version. Oswald Buddenhagen (3): rebase: simplify code related to imply_merge() rebase: handle --strategy via imply_merge() as well rebase: move parse_opt_keep_empty() down builtin/rebase.c | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) -- 2.42.0.419.g70bf8a5751