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

2018-01-04 Thread Johannes Schindelin
Hi Matwey, On Mon, 1 Jan 2018, Matwey V. Kornilov wrote: > 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 > # git checkout v3.9 > # git branch abc-3.9 > # git checkout abc-3.8 > > Introduce new commit o

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 >>> >>> And then I see: >>> >>> fatal: Unknown option

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

2018-01-04 Thread 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 >> >> And then I see: >> >> fatal: Unknown option for merge-recursive: -X'diff-algorithm=patience' The

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

2018-01-04 Thread Matwey V. Kornilov
Hi, It seems there is some issue with double escaping: 14:57:18.524010 git.c:344 trace: built-in: git 'merge' '--no-log' '--no-ff' '--strategy=recursive' '-X' ''\''diff-algorithm=p atience'\''' '-m' 'Merge branch '\''core-rcu-for-linus'\'' of git://git.kernel.org/pub/scm/linux/kern

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

2018-01-01 Thread 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 # git checkout v3.9 # git branch abc-3.9 # git checkout abc-3.8 Introduce new commit on top of abc-3.8. Here, I edit README. # vim README # git commit -a -v [abc-3.8 4b