Git has 2 attributes that deal with end-of-lines: text Documentation says: This attribute enables and controls end-of-line normalization. When a text file is normalized, its line endings are converted to LF in the repository This effectively means that when you commit to the repo, it will convert line-endings to LF eol Documentation says: This attribute … Read more
# This is a comment! in .gitattributes.
Examples can be found in Linguist’s documentation. Detecting wrong languages (which’s what OP asks) can be achieved by setting linguist-language attributes in the .gitattributes file. linguist-language With the following attribute, Linguist detects all .rb files as being Java files. *.rb linguist-language=Java linguist-vendored With the following attribute, Linguist detects files in the special-vendored-path directory (notice the … Read more
Is .gitattributes a file or a folder ? How do I create it ? Windows : Create a new text file (Right click>new>text file) within windows explorer and rename it (Shortcut : F2) as follows .gitattributes. Note : That is DOT + gitattributes + DOT, windows will remove the trailing DOT for you producing the … Read more
Git 2.10 fixed this and now behaves as one would expect.
The best way to avoid having to set core.autocrlf separately on each machine seems to be checking a .gitattributes file into the repository containing the single line * -text Or, if you have an older version of Git then * -crlf This tells Git that, for all paths (thus the *), end-of-line normalization should not … Read more
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
From the docs: Each line in .gitattributes (or .git/info/attributes) file is of form: pattern attr1 attr2 … So here, the pattern is *, which means all files, and the attribute is text=auto. What does text=auto do? From the documentation: When text is set to “auto”, the path is marked for automatic end-of-line normalization. If Git … 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