repairing git squash mistakes