diff --git a/.config/git/config b/.config/git/config
index 0f0a014..c4566f4 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -15,9 +15,19 @@
 	prompt = false
 [alias]
 	dt = difftool
-	d = diff
+    d = diff
+    b = branch -vv
 [merge]
 	tool = vimdiff
 	conflictstyle = diff3
 [mergetool]
-	prompt = false
+    prompt = false
+[credential]
+	helper = /usr/bin/pass-git-helper
+[format]
+	signOff = yes
+[sendemail]
+	smtpserver = mail.serguzim.me
+	smtpuser = tobias@msrg.cc
+	smtpencryption = tls
+	smtpserverport = 587
diff --git a/.config/pass-git-helper/git-pass-mapping.ini b/.config/pass-git-helper/git-pass-mapping.ini
new file mode 100644
index 0000000..6ebc9b6
--- /dev/null
+++ b/.config/pass-git-helper/git-pass-mapping.ini
@@ -0,0 +1,2 @@
+[mail.serguzim.me:587]
+target=mail/${username}