Update primary Canonical mail and a few other small tweaks

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

diff --git a/.config/git/config b/.config/git/config
index fd440a6..535ced4 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -3,7 +3,7 @@
        email = bandali@gnu.org
        signingKey = BE6273738E616D6D1B3A08E8A21A020248816103
 
        email = bandali@gnu.org
        signingKey = BE6273738E616D6D1B3A08E8A21A020248816103
 

-[commit]
+[tag]

        gpgSign = true
 
 # [format]
        gpgSign = true
 
 # [format]


@@ -23,10 +23,11 @@
        a = add
        s = status
        sl = status --long
        a = add
        s = status
        sl = status --long

-    l = log
+       l = log

        c = checkout
        cb = checkout -b
        b = branch
        c = checkout
        cb = checkout -b
        b = branch

+       d = diff

        f = fetch
        r = rebase
        p = pull
        f = fetch
        r = rebase
        p = pull


@@ -73,3 +74,22 @@
 
 [init]
        defaultBranch = main
 
 [init]
        defaultBranch = main

+
+[url "bandali@git.launchpad.net:"]
+       insteadof = lp:
+[url "git@salsa.debian.org:"]
+       insteadof = salsa:
+[url "git@salsa.debian.org:gnome-team/"]
+       insteadof = pkg-gnome:
+[url "git@salsa.debian.org:bandali/"]
+       insteadof = salsa-bandali:
+[url "git@github.com:"]
+       insteadof = gh:
+[merge "dpkg-mergechangelogs"]
+       name = debian/changelog merge driver
+       driver = dpkg-mergechangelogs -m %O %A %B %A
+
+[includeIf "gitdir:~/s/canonical/"]
+       path = ~/.config/git/config.canonical
+[includeIf "gitdir:~/s/sfl/"]
+       path = ~/.config/git/config.sfl