git reset --hard origin/dev
git rebase --continue
git rebase --abort
(if you are on your branch)
git ls-files -o --exclude-standardgives untracked files, so you can do something like below ( or add an alias to it):
git stash list
git apply ${}
git stash -u