Fighting with git