| Message ID | 20231020093654.922890-1-oswald.buddenhagen@gmx.de (mailing list archive) |
|---|---|
| Headers | show |
| Series | rebase refactoring | expand |
Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes: > 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(-) Looking quite straight-forward and I didn't see anythihng potentially controversial. Will queue. Thanks.
On 20/10/2023 23:07, Junio C Hamano wrote: > Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes: > >> 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(-) > > Looking quite straight-forward and I didn't see anythihng > potentially controversial. Yes they look good, thanks Oswald Best Wishes Phillip
Phillip Wood <phillip.wood123@gmail.com> writes: > On 20/10/2023 23:07, Junio C Hamano wrote: >> Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes: >> >>> 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(-) >> Looking quite straight-forward and I didn't see anythihng >> potentially controversial. > > Yes they look good, thanks Oswald Thanks, both. The topic has already been merged to 'next'.