git add path/to/untracked-filegit stash save "don't forget to un-add path/to/untracked-file" # stash w/reminder# do some other workgit stash list# shows:# stash@{0}: On master: don't forget to un-add path/to/untracked-filegit stash pop # or apply instead of pop, to keep the stash availablegit rm --cached path/to/untracked-file