diff --git a/.gitignore b/.gitignore
index c1e6e3f..dd9be17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,15 @@
-output*.*
+
+### TeX ###
+## Core latex/pdflatex auxiliary files:
+*.aux
+*.lof
+*.log
+*.lot
+*.fls
+*.out
+*.toc
+
+## Intermediate documents:
+*.dvi
+*-converted-to.*
+<<<<<<< HEAD