Git config updates

caspiano · May 22, 2023 · f4d026b · f4d026b
1 parent 9fef680
commit f4d026b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/git/.gitconfig b/git/.gitconfig
@@ -44,17 +44,20 @@
 ; [url "[email protected]:"]
 ;     insteadOf = https://github.com/
 
+[stash]
+    showPatch = true
+
 [init]
     defaultBranch = main
 [pull]
     rebase = false
 [advice]
     addIgnoredFile = false
 [gpg]
-    program = /usr/local/bin/gpg
+    program = gpg
 [commit]
     gpgsign = true
 [merge]
-	conflictstyle = diff3
+    conflictstyle = diff3
 [push]
-	autoSetupRemote = true
+    autoSetupRemote = true