diff options
| author | Avery Pennarun <apenwarr@gmail.com> | 2009-11-25 21:23:57 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 22:45:17 -0800 |
| commit | ee2c79552acceaa59a78518c6c084bd515606374 (patch) | |
| tree | c8346d5dd29f924fdb136b8a1f55ae46aed641e9 /merge-recursive.c | |
| parent | 8cc5b29065e19267cbc08b39c34674b02c2e3d59 (diff) | |
| download | git-ee2c79552acceaa59a78518c6c084bd515606374.tar.gz git-ee2c79552acceaa59a78518c6c084bd515606374.tar.xz | |
Teach git-pull to pass -X<option> to git-merge
This needs the usual sq then eval trick to allow IFS characters
in the option.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions