From 04a8c80a6c05a30d9d8270da89cf095a95c6e384 Mon Sep 17 00:00:00 2001
From: Andrew Coleman <penguincoder@gmail.com>
Date: Mon, 3 Aug 2020 11:54:20 -0400
Subject: [PATCH] use rebase/autostash on git pull

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

diff --git a/.gitconfig b/.gitconfig
index 896fbf0..aa89bb6 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -19,7 +19,7 @@
   prompt = false
 
 [pull]
-  rebase = false
+	rebase = true
 
 [color]
   branch = auto
@@ -53,3 +53,5 @@
    --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
   up = pull --rebase
   branches-last-updated = branch -rv --sort=committerdate --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)\t%(color:magenta)%(authorname)%(color:reset)\t%(color:yellow)%(refname:short)%(color:reset)'
+[rebase]
+	autoStash = true