diff --git a/.gitignore b/.gitignore
index f72cf9363..a0653ebd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,10 @@ INSTALL
 *.la
 .*.swp
 
+### editor crap
+*.rej
+*~
+
 ### binaries that fall out of the build
 lib/sectionsdclient/sectionsdcontrol
 src/neutrino