[up]
undoing strips, rebases and amends