Added a git alias to log merges