Re: rebase preserve-merges: incorrect merge commits

2018-01-09 Thread Matwey V. Kornilov
2018-01-09 16:25 GMT+03:00 Johannes Schindelin <johannes.schinde...@gmx.de>: > Hi Matwey, > > On Tue, 9 Jan 2018, Matwey V. Kornilov wrote: > >> 2018-01-08 22:36 GMT+03:00 Johannes Schindelin <johannes.schinde...@gmx.de>: >> > >> > On Mon, 8 Jan 20

Re: rebase preserve-merges: incorrect merge commits

2018-01-09 Thread Matwey V. Kornilov
2018-01-08 22:36 GMT+03:00 Johannes Schindelin <johannes.schinde...@gmx.de>: > Hi Matwey, > > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > >> 2018-01-08 19:32 GMT+03:00 Johannes Schindelin <johannes.schinde...@gmx.de>: >> > >> > On Mon, 8 Jan 20

Re: rebase preserve-merges: incorrect merge commits

2018-01-08 Thread Matwey V. Kornilov
2018-01-08 19:32 GMT+03:00 Johannes Schindelin <johannes.schinde...@gmx.de>: > Hi, > > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: > >> 2018-01-08 17:42 GMT+03:00 Matwey V. Kornilov <matwey.korni...@gmail.com>: >> > 2018-01-08 16:56 GMT+03:00 Johannes Schin

Re: rebase preserve-merges: incorrect merge commits

2018-01-08 Thread Matwey V. Kornilov
2018-01-08 17:42 GMT+03:00 Matwey V. Kornilov <matwey.korni...@gmail.com>: > 2018-01-08 16:56 GMT+03:00 Johannes Schindelin <johannes.schinde...@gmx.de>: >> Hi Matwey, >> >> On Mon, 8 Jan 2018, Matwey V. Kornilov wrote: >> >>> I think tha

Re: rebase preserve-merges: incorrect merge commits

2018-01-08 Thread Matwey V. Kornilov
2018-01-08 16:56 GMT+03:00 Johannes Schindelin <johannes.schinde...@gmx.de>: > 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

rebase preserve-merges: incorrect merge commits

2018-01-08 Thread Matwey V. Kornilov
is created: -- A' -- (AM)' --\ \\ M' (==M")M" // -- B' -- (BM)' --/ 5) Then (AM)' (BM)' and M" are discarded from the tree. Probably, I missed something important or incorrectly read git-rebase--interactive.sh -- With best regards, Matwey V. Kornilov

Re: Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience'

2018-01-04 Thread Matwey V. Kornilov
2018-01-04 21:57 GMT+03:00 Junio C Hamano <gits...@pobox.com>: > "Matwey V. Kornilov" <matwey.korni...@gmail.com> writes: > >> It seems there is some issue with double escaping: >> ... >>> # git rebase --preserve-merges -s recursive -Xdiff-a

Re: Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience'

2018-01-04 Thread Matwey V. Kornilov
/kernel/git/tip/tip Where did additional quotes around diff-algorithm came from? 01.01.2018 14:28, Matwey V. Kornilov пишет: > Hello, > > I am running git 2.15.1 and facing the following issue with linux kernel > tree. > > # git checkout v3.8 > # git branch abc-3.8 > # g

Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience'

2018-01-01 Thread Matwey V. Kornilov
e84cf5d0fd53badf3a93c790e280cc92a69ed999 Attached here is GIT_TRACE=1 output. -- With best regards, Matwey V. Kornilov