Merge branch 'master' of ssh://git.penguincoder.org:2222/penguincoder/dotfiles

2020-07-15 12:56:19 -04:00 · 2020-07-15 12:56:19 -04:00 · 5974dc7f66
commit 5974dc7f66
parent 7cda7a2731 f1d40084b6
2 changed files with 5 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -18,6 +18,9 @@
  conflictstyle = diff3
  prompt = false

+[pull]
+  rebase = false
+
 [color]
  branch = auto
  diff = auto
--- 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