RIOT/.gitattributes

*.a binary
*.patch binary
Cargo.lock binary
# Default conflict marker size is 7 which causes some of the headings in
# release-notes.txt to trigger git diff --check: 'leftover conflict marker'
# when the heading is exactly 7 characters long.
*.md conflict-marker-size=100
*.txt conflict-marker-size=100
make: OSX: don't fail for empty .a archives Fixes issue #1333. 2014-06-19 13:13:06 +02:00			`*.a binary`
git: handle patch files as binary 2015-12-04 11:45:55 +01:00			`*.patch binary`
rust: Treat Cargo.lock files as opaque Cargo.lock files pin the versions of all transitive dependencies, and are left that way by Cargo unless requested manually (`cargo update`) or necessitated by a change in dependencies (if the manually maintained Cargo.toml says `>0.5.2` and .lock says `0.5.1`, the latter is reset). They are fixed (as opposed to .gitignoring them and letting each user autogenerate them) to ensure that third party changes do not break RIOT CI builds; for updates, the changes from a `cargo update` can still be committed and then run through CI checks. (This is analogous to how pkg versions are pinned). They are set to binary because their diffs are usually not practical to read. 2021-12-14 13:22:32 +01:00			`Cargo.lock binary`
.gitattributes: add markdown special case. Increase conflict marker size to avoid false positives with git diff --check (The conflict marker is a line of equals signs `=` which is inserted whenever there is a merge conflict) 2015-05-09 11:23:09 +02:00			`# Default conflict marker size is 7 which causes some of the headings in`
			`# release-notes.txt to trigger git diff --check: 'leftover conflict marker'`
			`# when the heading is exactly 7 characters long.`
			`*.md conflict-marker-size=100`
			`*.txt conflict-marker-size=100`