Comment by yes_man

You have never split your working tree changes into separate commits?