add all sorts of things

1 files changed, 16 insertions, 0 deletions

diff --git a/git/dot-config/git/config b/git/dot-config/git/config
index 8df961c..62ddc08 100644
--- a/git/dot-config/git/config
+++ b/git/dot-config/git/config
@@ -4,14 +4,30 @@
 	ci = commit
 	s = status -sb
 	l = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%ai%C(reset) - %C(bold white)%an%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset)'
+
 [pull]
 	rebase = true
+
 [init]
 	defaultBranch = main
+
 [user]
 	name = Mohammad Reza Karimi
 	email = m.r.karimi.j@gmail.com
+	signingkey = 802D310CAC1F1CE6EDD55DF10A777EAC5BCAEB1B
+
 [commit]
 	verbose = true
+	gpgsign = true
+
+[tag]
+	gpgsign = true
+
+[diff]
+	algorithm = histogram
+
+[merge]
+	conflictstyle = zdiff3
+
 [credential "https://git.overleaf.com"]
 	helper = !pass git/overleaf@mit