Merge branch '6-files-under-version-control-that-are-to-be-ignored-in-gitignore' into '5.1'

Resolve "Files under version control that are to be ignored in .gitignore"

See merge request Boeing-CORE/CORE!1
This commit is contained in:
Blake Harnden 2018-03-05 12:56:49 -07:00
commit 4858151d7c

3
.gitignore vendored
View file

@ -4,6 +4,7 @@
.version .version
.version.date .version.date
Makefile Makefile
!kernel/**/Makefile
Makefile.in Makefile.in
aclocal.m4 aclocal.m4
autom4te.cache autom4te.cache
@ -13,7 +14,6 @@ config.h.in
config.log config.log
config.status config.status
configure configure
core-*.tar.gz
debian debian
stamp-h1 stamp-h1
@ -36,6 +36,7 @@ coverage.xml
# ignore package files # ignore package files
*.rpm *.rpm
*.deb *.deb
*.tar.gz
# pytest cache files # pytest cache files
.cache .cache