On Jan 03 2017, Russ Allbery <r...@debian.org> wrote: > Nikolaus Rath <nikol...@rath.org> writes: > >> For example, if you get a merge conflict when rebasing, the above >> incantation will list two commits: the original debian commit and the >> merge commit. git-debcherry, on the other hand, will synthesize one >> patch, consisting of the original Debian commit, but modified to include >> the *relevant parts* of the merge commit. > > Okay, yes, that sounds pretty awesome. That may entirely remove my > concerns about keeping the patches always rebased.
Well, as I said in my other mail: the big drawback is that even with a small test tree running git-debcherry is already slow enough for the user to ponder the implications of it being a 300 line bash script... Best, -Nikolaus -- GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F »Time flies like an arrow, fruit flies like a Banana.«