Don't need to do the stash/unstash dance, just use diff-index