Add alias and merge tool for git.
Add alias for optimizing git