Git config updates

Author: caspiano

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