This has been sent by mistake, I'm sorry, please disregard.
Sergey Organov writes:
> Johannes Schindelin writes:
>
>> Junio, I think this is now ready for `next`. Thank you for your patience
>> and help with this.
[...]
Johannes Schindelin writes:
> Junio, I think this is now ready for `next`. Thank you for your patience
> and help with this.
>
> Once upon a time, I dreamed of an interactive rebase that would not
> linearize all patches and drop all merge commits, but instead recreate
> the commit topology fait
Junio C Hamano writes:
>> - Rebased the patch series on top of current `master`, i.e. both
>> `pw/rebase-keep-empty-fixes` and `pw/rebase-signoff`, to resolve merge
>> conflicts myself.
>
> Good to see the last item, as this gave me a chance to make sure
> that the conflict resolution I've be
Johannes Schindelin writes:
> Changes since v8:
>
> - Disentangled the patch introducing `label`/`reset` from the one
> introducing `merge` again (this was one stupid, tired `git commit
> --amend` too many).
>
> - Augmented the commit message of "introduce the `merge` command" to
> describe
Junio, I think this is now ready for `next`. Thank you for your patience
and help with this.
Once upon a time, I dreamed of an interactive rebase that would not
linearize all patches and drop all merge commits, but instead recreate
the commit topology faithfully.
My original attempt was --preserv
5 matches
Mail list logo
