From 045395dabba79f06438885a9cdd9f7a154d55fb0 Mon Sep 17 00:00:00 2001
From: Price Hiller <price@orion-technologies.io>
Date: Tue, 21 Mar 2023 13:48:08 -0500
Subject: [PATCH] feat(git): improve git config settings

---
 dots/.gitconfig | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dots/.gitconfig b/dots/.gitconfig
index e508d2f5..45ee47fc 100644
--- a/dots/.gitconfig
+++ b/dots/.gitconfig
@@ -44,6 +44,7 @@
 
 [pull]
 	rebase = false
+	ff = only
 [alias]
 	unstage = reset HEAD --
 [push]
@@ -67,3 +68,13 @@
 	format = ssh
 [commit]
 	gpgsign = true
+[log]
+	abbrevCommit = true
+	decorate = short
+[apply]
+	ignoreWhitespace = change
+[rerere]
+	enabled = true
+	autoUpdate = true
+[am]
+	threeWay = true