diff --git a/.gitignore b/.gitignore
index a178b6ddac8..82c08abd7db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,13 @@
 # Emacs save files
 *~
 
+# Vim-related files
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+
 # Go test binaries
 *.test