Various deb packaging settings/conveniences

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

diff --git a/.config/git/config b/.config/git/config
index 7db0f89..ac28a35 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -23,9 +23,11 @@
        a = add
        s = status
        sl = status --long
        a = add
        s = status
        sl = status --long

+    l = log

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

+       f = fetch

        r = rebase
        p = pull
        pr = pull --rebase
        r = rebase
        p = pull
        pr = pull --rebase


@@ -70,4 +72,19 @@
        fsckObjects = true
 
 [init]
        fsckObjects = true
 
 [init]

-       templateDir = ~/.config/git/template
+       defaultBranch = main
+
+[url "bandali@git.launchpad.net:"]
+       insteadof = lp:
+[url "git@salsa.debian.org:gnome-team/"]
+       insteadof = pkg-gnome:
+[url "git@salsa.debian.org:bandali/"]
+       insteadof = salsa-bandali:
+[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