Still loving git stash.
Being able to split out and reapply change sets onto a fresh pull is very liberating. Trying out small changes or reapplying local settings, whilst easily keeping abreast with upstream changes can be essential when working with two or more other developers on the same code base.