Re: [PATCH] rebase -p: fix quoting when calling `git merge`

Hi Junio, On Fri, 5 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > git-rebase--interactive.sh | 9 ++--- > > t/t3418-rebase-continue.sh | 14 ++ > > 2 files changed, 20 insertions(+), 3 deletions(-) > > > > diff --git

Re: [PATCH] rebase -p: fix quoting when calling `git merge`

Johannes Schindelin writes: > git-rebase--interactive.sh | 9 ++--- > t/t3418-rebase-continue.sh | 14 ++ > 2 files changed, 20 insertions(+), 3 deletions(-) > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index

[PATCH] rebase -p: fix quoting when calling `git merge`

It has been reported that strategy arguments are not passed to `git merge` correctly when rebasing interactively, preserving merges. The reason is that the strategy arguments are already quoted, and then quoted again. This fixes https://github.com/git-for-windows/git/issues/1321