diff --git a/.gitignore b/.gitignore
index fa99439ac8..59cec00b21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,12 @@
+# if you want to ignore files created by your editor/tools,
+# please consider a global .gitignore https://help.github.com/articles/ignoring-files
+*.exe
+*.exe~
+*.orig
+.*.swp
 .DS_Store
+Thumbs.db
+.editorconfig
 /build/
 cli/winresources/rsrc_386.syso
 cli/winresources/rsrc_amd64.syso