![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Avery Pennarun <apenwarr@gmail.com> | |
| Thu, 26 Nov 2009 02:23:57 +0000 (21:23 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 Jan 2010 06:45:17 +0000 (22:45 -0800) | ||
| commit | ee2c79552acceaa59a78518c6c084bd515606374 | |
| tree | c8346d5dd29f924fdb136b8a1f55ae46aed641e9 | tree | snapshot |
| parent | 8cc5b29065e19267cbc08b39c34674b02c2e3d59 | commit | diff |
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>
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>
| git-pull.sh | diff | blob | history | |
| t/t6037-merge-ours-theirs.sh | diff | blob | history |