Isaac has some controversial views at times (semicolon discussion anyone? ;) but here I fully agree with him. When working on a very long and complicated featu

Isaac has some controversial views at times (semicolon discussion anyone? ;) but here I fully agree with him. When working on a very long and complicated feature on an unknown terrain, I commit "wip"s very frequently and rebase from time to time. I also frequently fork branches (from "foo-wip-1" to "foo-wip-2") before rebasing just in case I ever wanted to look at my messy history. When everything's done and thoroughly tested I delete a batch of branches. This might sound like an overkill but it costs you literally nothing and might be useful sometimes.