Teach git-pull to pass -X<option> to git-merge