For some reason, I started seeing .DS_Store showing up in git. Not sure why this is something new in El Capitan, but the solution is simple; just add a global gitignore and the problem goes away.