Fix -R to work better (especially with git)