A few small misc updates

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

diff --git a/.config/git/config b/.config/git/config
index bf797ab..993b9a8 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,10 +1,5 @@
 [user]
        name = Amin Bandali
 [user]
        name = Amin Bandali

-       email = mab@gnu.org
-       signingkey = BE6273738E616D6D1B3A08E8A21A020248816103
-
-[commit]
-       gpgsign = true

 
 # [format]
 #      signoff = true
 
 # [format]
 #      signoff = true


@@ -17,9 +12,6 @@
 [mailmap]
        file = ~/.config/git/mailmap
 
 [mailmap]
        file = ~/.config/git/mailmap
 

-[gpg]
-       program = gpg2
-

 [alias]
        git = !exec git  # handle nested git calls, e.g. git git status
        aliases = config --get-regexp '^alias\\.'
 [alias]
        git = !exec git  # handle nested git calls, e.g. git git status
        aliases = config --get-regexp '^alias\\.'


@@ -36,6 +28,15 @@
        psf = push --force
        nmam = "!f() { notmuch show --format=raw $1 | git am -; }; f"
        nmam3 = "!f() { notmuch show --format=raw $1 | git am -3 -; }; f"
        psf = push --force
        nmam = "!f() { notmuch show --format=raw $1 | git am -; }; f"
        nmam3 = "!f() { notmuch show --format=raw $1 | git am -3 -; }; f"

+       gnu = "! \
+         git config user.email 'bandali@gnu.org'; \
+         git config user.signingKey 'BE6273738E616D6D1B3A08E8A21A020248816103'; \
+         git config commit.gpgSign true"
+       kelar = "! \
+         git config user.email 'bandali@kelar.org'; \
+         git config user.signingKey 'BE6273738E616D6D1B3A08E8A21A020248816103'; \
+         git config commit.gpgSign true"
+       work = config user.email 'amin.bandali@savoirfairelinux.com'

 
 [color]
        ui = auto
 
 [color]
        ui = auto


@@ -56,11 +57,17 @@
 #      branch=true
 
 [github]
 #      branch=true
 
 [github]

-       user = aminb
+       user = notbandali

 
 [sendemail]
        smtpuser = bandali
 
 [sendemail]
        smtpuser = bandali

-       smtpserver = fencepost.gnu.org
+       smtpserver = mail.kelar.org

        smtpserverport = 587
        smtpencryption = tls
        annotate = yes
        smtpserverport = 587
        smtpencryption = tls
        annotate = yes

+
+[transfer]
+       fsckObjects = true
+
+[init]
+       templateDir = ~/.config/git/template