* .local/bin/startup-progs: Add host-specific X resources.

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

diff --git a/.config/git/config b/.config/git/config
index 993b9a8..fd440a6 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,5 +1,10 @@
 [user]
        name = Amin Bandali
+       email = bandali@gnu.org
+       signingKey = BE6273738E616D6D1B3A08E8A21A020248816103
+
+[commit]
+       gpgSign = true
 
 # [format]
 #      signoff = true
@@ -18,9 +23,11 @@
        a = add
        s = status
        sl = status --long
+    l = log
        c = checkout
        cb = checkout -b
        b = branch
+       f = fetch
        r = rebase
        p = pull
        pr = pull --rebase
@@ -28,15 +35,10 @@
        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'
+       gnu = config user.email 'bandali@gnu.org'
+       kelar = config user.email 'bandali@kelar.org'
+       sfl = config user.email 'amin.bandali@savoirfairelinux.com'
+       canonical = config user.email 'amin.bandali@canonical.com'
 
 [color]
        ui = auto
@@ -57,11 +59,11 @@
 #      branch=true
 
 [github]
-       user = notbandali
+       user = bandali0
 
 [sendemail]
        smtpuser = bandali
-       smtpserver = mail.kelar.org
+       smtpserver = fencepost.gnu.org
        smtpserverport = 587
        smtpencryption = tls
        annotate = yes
@@ -70,4 +72,4 @@
        fsckObjects = true
 
 [init]
-       templateDir = ~/.config/git/template
+       defaultBranch = main