Add a few helper aliases for git merge
Use git-wildignore