diff --git a/.gitignore b/.gitignore
index 3c8b31877..4620e3b43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 *~
+*.orig
+*.swp
+*.rej
 
 /base-codezero/contrib
 /base-fiasco/contrib