X-Git-Url: https://git.auder.net/img/vendor/vue.min.js?a=blobdiff_plain;f=.gitignore;h=d0a62dfafba24d684c0a467f32fcaea66c5cef26;hb=81cb8b9e38ae82f2c108f11df56d53c9e29366ed;hp=7907672b91344432074e267963c9de29348dc832;hpb=7b584412dd1dca22bbb9055a53132abe1b06a4a8;p=talweg.git

diff --git a/.gitignore b/.gitignore
index 7907672..d0a62df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,50 @@
-#NOTE: knitr generated files in ignored folder under reports (?!)
-.RData
+#roxygen2 generated files
+NAMESPACE
+*.Rd
+!*-package.Rd
+
+#temporary files
+*~
+*.swp
+
+#R session files
 .Rhistory
+.RData
+
+#R CMD build/check files
+/*.Rcheck/
+/*.tar.gz
+<<<<<<< HEAD
+
+#object & library files
+*.[oa]
+*.so
+
+#jupyter checkpoints + generated ipynb,html
 .ipynb_checkpoints/
-*.swp
-*~
-/data/*.csv
-/man/*
-!/man/*-package.Rd
-*.tar.gz
-NAMESPACE
+/reports/*.ipynb
 /reports/*.html
+
+#large CSV files
+data/*.csv
+
+#misc
+*.png
+#*.tex
+/AirNormand/
+
+#.gitattributes/.gitfat files are generated by initialize.sh
+.gitattributes
+.gitfat
+
+#Rmarkdown, knitr + LaTeX generated files
+#*.tex
+*.pdf
+!/biblio/*.pdf
+*.aux
+*.dvi
+*.log
+*.out
+*.toc
+*.synctex.gz
+figure/