From 6959610f8afc3c5f1038b8107c4e3ca5cdf1f3f3 Mon Sep 17 00:00:00 2001
From: Alpha Chen <alpha.chen@brilliant.org>
Date: Sun, 16 Oct 2022 09:19:02 -0700
Subject: [PATCH] .gitconfig

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

diff --git a/.gitconfig b/.gitconfig
index 201a475..f49e996 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,3 @@
-[include]
-	path = ~/.gitconfig.private
 [color]
 	ui = auto
 	diff = true
@@ -54,7 +52,7 @@
 	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
 	trustExitCode = true
 [init]
-	templatedir = ~/.git_templates
+	; templatedir = ~/.git_templates
 	defaultBranch = main
 [diff]
 	algorithm = histogram
@@ -69,6 +67,7 @@
 [rebase]
 	autosquash = true
 	stat = true
+	updateRefs = true
 [interactive]
 	singlekey = true
 ; [url "git@github.com:"]
@@ -102,3 +101,5 @@
 	format = ssh
 [gpg "ssh"]
 	program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
+[include]
+	path = ~/.gitconfig.local