git-related tweaks