From 95ed192c922b36e283679c4dc6f0e0f1d26ea9df Mon Sep 17 00:00:00 2001
From: Andrew Coleman <penguincoder@gmail.com>
Date: Wed, 15 Jul 2020 12:42:13 -0400
Subject: [PATCH 1/2] update git config for pull rebasing

---
 .gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 550a453..1eee9ed 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -15,6 +15,9 @@
   conflictstyle = diff3
   prompt = false
 
+[pull]
+  rebase = false
+
 [color]
   branch = auto
   diff = auto

From f1d40084b64013925d32db47f75ffef1b93d9f3a Mon Sep 17 00:00:00 2001
From: Andrew Coleman <penguincoder@gmail.com>
Date: Wed, 15 Jul 2020 12:42:35 -0400
Subject: [PATCH 2/2] highlight matches while searching

---
 .vimrc | 2 ++
 1 file changed, 2 insertions(+)

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