From bf403d30a1f1cc21a730dc420a44b36ee6ca8778 Mon Sep 17 00:00:00 2001
From: James Patrick <james@greenfiling.com>
Date: Fri, 9 Aug 2024 09:59:39 -0400
Subject: [PATCH] Use ~/.gitconfig.local for env specific settings

Signing key tooling, machine specific diff tools, etc
---
 git/gitconfig | 5 +++--
 git/makefile  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/git/gitconfig b/git/gitconfig
index 9afe3ee..56b2143 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -6,8 +6,6 @@
 [gpg]
   format = ssh
 
-[gpg "ssh"]
-  program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
 
 [commit]
   gpgsign = true
@@ -39,3 +37,6 @@
 
 [push]
 	autoSetupRemote = true
+
+[include]
+    path = ~/.gitconfig.local
diff --git a/git/makefile b/git/makefile
index 6aed267..26864b2 100644
--- a/git/makefile
+++ b/git/makefile
@@ -8,6 +8,7 @@ include ../lib/shared.mk
 init:
 	$(report) header "Setting up gitconfig"
 	$(mk_link) $(SOURCE) $(TARGET)
+	touch $(TARGET).local
 
 up: init