Re: rebase preserve-merges: incorrect merge commits

Hi Matwey, On Tue, 9 Jan 2018, Matwey V. Kornilov wrote: > 2018-01-09 16:25 GMT+03:00 Johannes Schindelin : > > Hi Matwey, > > > > On Tue, 9 Jan 2018, Matwey V. Kornilov wrote: > > > >> 2018-01-08 22:36 GMT+03:00 Johannes Schindelin > >> : > >> > > >> > On Mon, 8 Jan 2018, Matwey V. Kornilov wro

Re: rebase preserve-merges: incorrect merge commits

2018-01-09 16:25 GMT+03:00 Johannes Schindelin : > Hi Matwey, > > On Tue, 9 Jan 2018, Matwey V. Kornilov wrote: > >> 2018-01-08 22:36 GMT+03:00 Johannes Schindelin : >> > >> > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: >> > >> >> 2018-01-08 19:32 GMT+03:00 Johannes Schindelin >> >> : >> >> > >>

Re: rebase preserve-merges: incorrect merge commits

Hi Matwey, On Tue, 9 Jan 2018, Matwey V. Kornilov wrote: > 2018-01-08 22:36 GMT+03:00 Johannes Schindelin : > > > > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > > > >> 2018-01-08 19:32 GMT+03:00 Johannes Schindelin > >> : > >> > > >> > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > >> > > >>

Re: rebase preserve-merges: incorrect merge commits

2018-01-08 22:36 GMT+03:00 Johannes Schindelin : > Hi Matwey, > > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > >> 2018-01-08 19:32 GMT+03:00 Johannes Schindelin : >> > >> > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: >> > >> >> 2018-01-08 17:42 GMT+03:00 Matwey V. Kornilov : >> >> > 2018-01-08

Re: rebase preserve-merges: incorrect merge commits

Hi Matwey, On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > 2018-01-08 19:32 GMT+03:00 Johannes Schindelin : > > > > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > > > >> 2018-01-08 17:42 GMT+03:00 Matwey V. Kornilov : > >> > 2018-01-08 16:56 GMT+03:00 Johannes Schindelin > >> > : > >> >> Hi Mat

Re: rebase preserve-merges: incorrect merge commits

2018-01-08 19:32 GMT+03:00 Johannes Schindelin : > Hi, > > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > >> 2018-01-08 17:42 GMT+03:00 Matwey V. Kornilov : >> > 2018-01-08 16:56 GMT+03:00 Johannes Schindelin >> > : >> >> Hi Matwey, >> >> >> >> On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: >> >>

Re: rebase preserve-merges: incorrect merge commits

Hi, On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > 2018-01-08 17:42 GMT+03:00 Matwey V. Kornilov : > > 2018-01-08 16:56 GMT+03:00 Johannes Schindelin : > >> Hi Matwey, > >> > >> On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > >> > >>> I think that rebase preserve-merges algorithm needs further >

Re: rebase preserve-merges: incorrect merge commits

2018-01-08 17:42 GMT+03:00 Matwey V. Kornilov : > 2018-01-08 16:56 GMT+03:00 Johannes Schindelin : >> Hi Matwey, >> >> On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: >> >>> I think that rebase preserve-merges algorithm needs further >>> improvements. Probably, you already know it. >> >> Yes. preserv

Re: rebase preserve-merges: incorrect merge commits

2018-01-08 16:56 GMT+03:00 Johannes Schindelin : > Hi Matwey, > > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > >> I think that rebase preserve-merges algorithm needs further >> improvements. Probably, you already know it. > > Yes. preserve-merges is a fundamentally flawed design. > > Please have

Re: rebase preserve-merges: incorrect merge commits

Hi Matwey, On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > I think that rebase preserve-merges algorithm needs further > improvements. Probably, you already know it. Yes. preserve-merges is a fundamentally flawed design. Please have a look here: https://github.com/git/git/pull/447 Sin

rebase preserve-merges: incorrect merge commits

Hello, I think that rebase preserve-merges algorithm needs further improvements. Probably, you already know it. I was playing with rebasing linux kernel tree and found that rebase preserve-merges works in counterintuitive way while handling merge-commits. I don't want to discuss arising merge con