X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=.gitignore;h=d0a62dfafba24d684c0a467f32fcaea66c5cef26;hb=81cb8b9e38ae82f2c108f11df56d53c9e29366ed;hp=06a87ed400b25dd09854ad74d93c38488a4d902d;hpb=dea7ff860b42b3e246c8fa7ce2fb514561b8bc43;p=talweg.git

diff --git a/.gitignore b/.gitignore
index 06a87ed..d0a62df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,50 @@
-#NOTE: knitr generated files in ignored folder under reports (?!)
-.RData
-.Rhistory
-.ipynb_checkpoints/
-*.swp
-*~
-data/*.csv
+#roxygen2 generated files
+NAMESPACE
 *.Rd
 !*-package.Rd
-*.tar.gz
-NAMESPACE
+
+#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/
+/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/