subsurface/.gitattributes

.gitignore	export-ignore
.gitattributes	export-ignore
Documentation/*.html.git text=auto
theme/jqplot.canvasAxisTickRenderer.min.js binary
theme/jqplot.highlighter.min.js binary
theme/jquery.jqplot.min.js binary
theme/jquery.min.js binary
CHANGELOG.md -text merge=union
Ignore some files when archiving. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org> 2013-05-12 13:00:12 +00:00			`.gitignore export-ignore`
			`.gitattributes export-ignore`
Don't use CRLF in documentation files Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org> 2016-03-14 16:19:27 +00:00			`Documentation/*.html.git text=auto`
Flag more minified javascript as binary This is so that crap doesn't show up when doing ex. git grep Signed-off-by: Anton Lundin <glance@acc.umu.se> 2017-06-01 12:46:00 +00:00			`theme/jqplot.canvasAxisTickRenderer.min.js binary`
			`theme/jqplot.highlighter.min.js binary`
			`theme/jquery.jqplot.min.js binary`
Treat minified JavaScript as binary 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-06-26 20:37:29 +00:00			`theme/jquery.min.js binary`
release-notes: use CHANGELOG.md 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-11-28 21:16:18 +00:00			`CHANGELOG.md -text merge=union`