added git resume, fixed up some cases in git finish