]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8cc5b29) | patch
Teach git-pull to pass -X<option> to git-merge
authorAvery Pennarun <apenwarr@gmail.com>
Thu, 26 Nov 2009 02:23:57 +0000 (21:23 -0500)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jan 2010 06:45:17 +0000 (22:45 -0800)
commitee2c79552acceaa59a78518c6c084bd515606374
treec8346d5dd29f924fdb136b8a1f55ae46aed641e9tree | snapshot
parent8cc5b29065e19267cbc08b39c34674b02c2e3d59commit | 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>
git-pull.sh diff | blob | blame | history
t/t6037-merge-ours-theirs.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.