diff --git a/.gitignore b/.gitignore
index 09eda17c..d2907491 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+.vim/undo/
 .vim/.netrwhist
 
diff --git a/.vim/undo/.keep b/.vim/undo/.keep
new file mode 100644
index 00000000..e69de29b
diff --git a/.vimrc b/.vimrc
index 4cd7b053..f61ffaf6 100755
--- a/.vimrc
+++ b/.vimrc
@@ -1,5 +1,9 @@
-" file settings
+" global settings
+set nocompatible
 set noswapfile
+set undofile
+set undodir=$HOME/.vim/undo
+" file settings
 set encoding=utf-8
 
 " key mappings