diff --git a/.gitconfig b/.gitconfig
index 9213a96..896fbf0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -18,6 +18,9 @@
   conflictstyle = diff3
   prompt = false
 
+[pull]
+  rebase = false
+
 [color]
   branch = auto
   diff = auto
diff --git a/.vimrc b/.vimrc
index 58e400f..1dc222f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -16,6 +16,8 @@ set expandtab
 set listchars=tab:>-,trail:-
 set list
 set noshowmode
+set hlsearch
+set incsearch
 syntax on
 
 filetype on