aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
AgeCommit message (Collapse)Author
2017-11-28release-notes: use CHANGELOG.mdGravatar Lubomir I. Ivanov
Add a file CHANGELOG.md in the root Subsurface directory and track this file with the `-text merge=union` attribute. This prevents merge conflicts if release notes are added on top of the file by different commits. Also, make ReleaseNotes/ReleaseNotes.txt point to that file. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-06-21Flag more minified javascript as binaryGravatar Anton Lundin
This is so that crap doesn't show up when doing ex. git grep Signed-off-by: Anton Lundin <glance@acc.umu.se>
2016-07-09Treat minified JavaScript as binaryGravatar Anton Lundin
The minified JavaScript is effectively a binary artifact that we carry in the repo. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-16Don't use CRLF in documentation filesGravatar Dirk Hohndel
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-12Ignore some files when archiving.Gravatar Cristian Ionescu-Idbohrn
Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>