Getting back on git's track