qt creator - Git diff doesn't work after git stash pop -

after git stash pop, there conflicts, things like:

<<<<<<< updated upstream int foo = 5; ======= int foo = 6; >>>>>>> stashed changes 

i resolved them in code, can't preview changes before committing them. this, , know there changes:

diff --cc mainwindow.cpp index 24dc025,2c44ad8..0000000 --- a/mainwindow.cpp +++ b/mainwindow.cpp 

how force git diff compare current source last commit?

your pop resulted in merge conflict. in order resolve it, need edit file (which did) , call git add mainwindow.cpp tell git, have resolved conflict.

if want preview changes, can git diff --cached. because git add added changes index.