Fighting with git..