Re: rebase preserve-merges: incorrect merge commits

2018-01-09 Thread Matwey V. Kornilov
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: >> > >>

Re: rebase preserve-merges: incorrect merge commits

2018-01-09 Thread Matwey V. Kornilov
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-0

Re: rebase preserve-merges: incorrect merge commits

2018-01-08 Thread Matwey V. Kornilov
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, >>

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 : > 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 >>> improveme

Re: rebase preserve-merges: incorrect merge commits

2018-01-08 Thread 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. preserve-merges is a fundament

rebase preserve-merges: incorrect merge commits

2018-01-08 Thread Matwey V. Kornilov
rge between A' and B' but reset the state to be the same as in M" before new merge commit 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 : > "Matwey V. Kornilov" writes: > >> It seems there is some issue with double escaping: >> ... >>> # git rebase --preserve-merges -s recursive -Xdiff-algorithm=patience >>> --onto abc-3.8 v3.8 abc-3.9 >>

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

2018-01-04 Thread Matwey V. Kornilov
' '-m' 'Merge branch '\''core-rcu-for-linus'\'' of git://git.kernel.org/pub/scm/linux/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 g

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

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