Adjust indent size for git diff/show; other tweaks