It shows five files with changed mode. (See attached screenshot) After I do 'git checkout --filename' on each of them and do 'git diff' again, exactly the same five files still show up.
On Thu, Feb 18, 2016 at 3:42 PM, Tony Kelman <t...@kelman.net> wrote: > As in the "Cannot pull with rebase...?" thread, what does `git diff` say > when run from the package directory? If you do `git checkout -- filename` > on each of the files with changes, does `git diff` then show anything? >