Comment by GianFabien

Reading these tips confirms that I'm too stoopid to use git.

Fortunately, I don't have to use git. So I just store work-in-progress as time-stamped files. Storage is cheap and plentiful. Can always diff, cherry pick, etc without confusing myself.