diff --git a/.gitignore b/.gitignore
index d958df61..3eff3bd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,9 @@ obj/
 [Rr]elease*/
 _ReSharper*/
 [Tt]est[Rr]esult*
-*.o
+*.o
+*~
+*#
 BIN/
 ipch/
 # We only care about specific files in the Visual Studio Projects