.gitconfig: Add more aliases
.gitconfig: Change behavior of the "less" pager
.gitconfig: Use clearer pager options
.gitconfig: Use different style when resolving merge conflicts
.gitconfig: Add alias for "git diff --cached"