Wither multiple staging areas, or have a way to split the changes from the working directory into multiple stashes (to apply later)... http://smartgit.userecho.com/topics/427-stash-hunks-interactively-by-selecting-then-in-a-index-editor-like-window/