emacs: erc: enable smiley module

[~bandali/configs] / .config / git / config

diff --git a/.config/git/config b/.config/git/config
index 35f1eb9..b519ef9 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,6 +1,6 @@
 [user]
        name = Amin Bandali
 [user]
        name = Amin Bandali

-       email = bandali@gnu.org
+       email = mab@gnu.org

        signingkey = BE6273738E616D6D1B3A08E8A21A020248816103
 
 [commit]
        signingkey = BE6273738E616D6D1B3A08E8A21A020248816103
 
 [commit]


@@ -14,8 +14,8 @@
        editor = emacsclient -t
        pager = "less"
 
        editor = emacsclient -t
        pager = "less"
 

-[gpg]
-       program = gpg2
+[mailmap]
+       file = ~/.config/git/mailmap

 
 [alias]
        git = !exec git  # handle nested git calls, e.g. git git status
 
 [alias]
        git = !exec git  # handle nested git calls, e.g. git git status