* .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 35f1eb9..fd440a6 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,10 +1,10 @@
 [user]
        name = Amin Bandali
        email = bandali@gnu.org
-       signingkey = BE6273738E616D6D1B3A08E8A21A020248816103
+       signingKey = BE6273738E616D6D1B3A08E8A21A020248816103
 
 [commit]
-       gpgsign = true
+       gpgSign = true
 
 # [format]
 #      signoff = true
@@ -14,8 +14,8 @@
        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
@@ -23,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
@@ -33,6 +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 = 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
@@ -53,7 +59,7 @@
 #      branch=true
 
 [github]
-       user = aminb
+       user = bandali0
 
 [sendemail]
        smtpuser = bandali
@@ -61,3 +67,9 @@
        smtpserverport = 587
        smtpencryption = tls
        annotate = yes
+
+[transfer]
+       fsckObjects = true
+
+[init]
+       defaultBranch = main