diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-01-04 22:31:52 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-01-05 12:26:01 -0800 |
| commit | dd6fb0053ce5b6923505e64993d8061484665962 (patch) | |
| tree | d865b635907a0a4227b4beb9e2a47bdaca05d763 /hex.c | |
| parent | Prepare for 2.15.2 (diff) | |
| download | tgif-dd6fb0053ce5b6923505e64993d8061484665962.tar.xz | |
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
Original-patch-by: Kim Gybels <kgybels@infogroep.be>
Also-reported-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'hex.c')
0 files changed, 0 insertions, 0 deletions