Git Remove Commit Without Losing Changes