cleaning up git's shittyness