File tree Expand file tree Collapse file tree 1 file changed +23
-2
lines changed
Expand file tree Collapse file tree 1 file changed +23
-2
lines changed Original file line number Diff line number Diff line change 11# This file configures how Git treats line endings.
22# This is important because we're working on both Windows and Unix machines.
3- # For details see https://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/.
3+ # For details see https://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/
4+ # and https://www.aleksandrhovhannisyan.com/blog/crlf-vs-lf-normalizing-line-endings-in-git/.
45
56# Git runs CRLF to LF replacement on files marked as `text`
67# every time they are written to the object database
78# and the reverse replacement when writing to the working directory.
9+
10+ # When spurious diffs due to EOL changes occur (e.g., after pulling remote), do the following:
11+ # * Inspect EOL with `git ls-files --eol`.
12+ # * Stage the diffs.
13+ # * Run `git rm --cached -r . && git reset --hard`.
14+ # * Run `git add --renormalize .`.
15+ # * Inspect EOL with `git lf-files --eol` again to verify that conversion worked.
16+ # * Commit the change containing the EOL conversions.
17+
818* .c text
919* .h text
1020* .py text
1626* .yml text
1727* .yaml text
1828* .sdf text
29+ * .props text
30+ * .ruleset text
31+ * .sln text
32+ * .vcxproj text
33+ * .def text
34+ * .map text
35+ * .user text
36+ makefile text
37+ makefile32 text
1938
2039* .sqlite binary
2140* .png binary
2443* .zip binary
2544* .dll binary
2645* .docx binary
27- * .pdf binary
46+ * .pdf binary
47+ * .jpg binary
48+ * .lib binary
You can’t perform that action at this time.
0 commit comments