Recovering from git fiasco