Git - Switching branches (windows) & uncommitted changes

Lookup git-stash for changing branches while there are unsaved changes in the current branch.

You are correct in your thinking about how this should work.

However, it sounds like git is having issues with the line endings, and it thinks all your files are modified even when they aren't. I don't use git on Windows, but I was going to suggest the "core.autocrlf" option to make the crlf handling work. However, the following blog entry indicates that this might not be a good idea: http://weierophinney.net/matthew/archives/191-git-svn-Tip-dont-use-core.autocrlf.html

I solved the problem hacking my pre-commit hook (commenting these lines in .git/hooks/pre-commit with a #):

#       if (/\s$/) {
#       bad_line("trailing whitespace", $_);
#       }