some more aliases and git diff algorithm