summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-17 22:31:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-17 22:46:27 -0800
commit14e5d40ca4f4f118fe03cbe5302309170b46096d (patch)
tree427f16aec9ff2f6f6cd4ed77fc4c2748320d9983 /merge-recursive.c
parentTeach git-pull to pass -X<option> to git-merge (diff)
downloadtgif-14e5d40ca4f4f118fe03cbe5302309170b46096d.tar.xz
pull: Fix parsing of -X<option>
As -X parameter can contain arbitrary $IFS characters, we need to properly quote it from the shell while forming the command line. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions