Skip to content

Commit a242213

Browse files
author
James Foster
authored
Merge pull request #285 from jgfoster/line-endings
Line endings
2 parents 115eb01 + 219c595 commit a242213

File tree

2 files changed

+40
-1
lines changed

2 files changed

+40
-1
lines changed

Diff for: .gitattributes

+39-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,40 @@
1+
# https://docs.github.com/en/github/using-git/configuring-git-to-handle-line-endings
2+
# https://git-scm.com/docs/gitattributes
3+
# https://git-scm.com/docs/git-config
4+
# https://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/
5+
6+
# Configure this repository to use Git's type detection algorithm to guess
7+
# whether a file is text or binary. Text files will have line endings converted
8+
# as if you had set
9+
# eol=native
10+
# That is, on Windows text files will have CRLF line endings in your working
11+
# directory while on Linux and macOS your text files will have LF line endings
12+
# in your working directory. In either case, they will have LF line endings in
13+
# the Git repository itself.
14+
115
# Set the default behavior, in case people don't have core.autocrlf set.
2-
* text eol=lf
16+
* text=auto
17+
18+
# Explicitly declare text files you want to always be normalized and converted
19+
# to native line endings on checkout. Git would likely get these right, but
20+
# we can be sure by adding them here.
21+
*.ino text diff=cpp
22+
*.c text diff=c
23+
*.cc text diff=cpp
24+
*.cxx text diff=cpp
25+
*.cpp text diff=cpp
26+
*.c++ text diff=cpp
27+
*.hpp text diff=cpp
28+
*.h text diff=c
29+
*.h++ text diff=cpp
30+
*.hh text diff=cpp
31+
32+
*.md text
33+
*.yaml text
34+
*.yml text
35+
36+
37+
# Denote all files that are truly binary and should not be modified.
38+
# Even if we don't have any of these, they make a good example.
39+
*.png binary
40+
*.jpg binary

Diff for: CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1212

1313
### Changed
1414
- Change 266 files from CRLF to LF.
15+
- Update .gitattributes so we have consistent line endings
1516
- Run tests on push as well as on a pull request so developers can see impact
1617

1718
### Deprecated

0 commit comments

Comments
 (0)