Nice write up. While show was mentioned, I feel this is missing git stash show stash@{3} -p to review the changes a patch contains. I’ve also used this to resolve conflicts by dumping the patch to a file that I can easily modify before applying.
$ git stash show stash@{3} -p > tmp.patch
$ vim tmp.patch
$ git apply tmp.patch
Nice write up. While
showwas mentioned, I feel this is missinggit stash show stash@{3} -pto review the changes a patch contains. I’ve also used this to resolve conflicts by dumping the patch to a file that I can easily modify before applying.$ git stash show stash@{3} -p > tmp.patch $ vim tmp.patch $ git apply tmp.patchscore 1 · canonical