Making it work with git