Global vs. system-wide settings There is some ambiguity in your question’s terminology. In a Git context, “global” usually means “user-level”; in other words, a global setting affect all repositories for one specific user (the active one). In contrast, a system-wide setting affects all repositories for all users of a machine. Repository-level gitattributes (I’m only mentioning … Read more
For those using v2.16 or better, you can simply use: git add –renormalize . # Update index with renormalized files git status # Show the files that will be normalized git commit -m “Introduce end-of-line normalization” These directions are straight out of the gitattributes. For older versions, the docs (prior to v2.12) provide a different … Read more
As many others have mentioned, a good modern solution is: git update-index –skip-worktree default_values.txt That will ignore changes to that file, both local and upstream, until you decide to allow them again with: git update-index –no-skip-worktree default_values.txt You can get a list of files that are marked skipped with: git ls-files -v . | grep … Read more
I expected to see the value true in the file You just created a new branch, not checked out its content (sice its content is the same as the branch you were in) To force the smudge to run, do at the top of the repo: git checkout HEAD — I have not yet merged … Read more