Update conf to reflect change in Git 1.7.8+