git stash

• Conflict Resolution

list
show [-p] [stash@{n}] -- [path]

apply
pop
drop stash@{0}

branch
clear: remove all
create
push

List with dates

Simple:

git stash list --date=local

Perty:

git stash list --pretty=format:"%C(auto)%h %<(15)%gd %<(10)%cr %s"

Back out of a merge

git reset --merge

Show diff

git stash show -p git stash show -p stash@{n}