@harrisj are you using magit? it's such a good friend in times of need