Re: real git pull grief

git diff shows a list of files that I have made some changes to and
the diff for files that I have not changed.

The files I have made changes to (config files), I never want to
commit or push and sometimes I may want them overwritten.  for now I
simply want to leave them there (changes to .sql files that are
specific to my environment).

What I want to know is why git is reporting that changes will be
overwritten to files that I have not touched or changed.

quoted

$git diff spews a lot of information.

Just a representative first 20 lines or so would be fine. :)

Jonathan