X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/ccbb71911874084108954d62c689ea6ebba53958..20b58f4d603c55b1aba42cc375a97b8708f725ba:/.config/git/config diff --git a/.config/git/config b/.config/git/config index ac28a35..535ced4 100644 --- a/.config/git/config +++ b/.config/git/config @@ -3,7 +3,7 @@ email = bandali@gnu.org signingKey = BE6273738E616D6D1B3A08E8A21A020248816103 -[commit] +[tag] gpgSign = true # [format] @@ -23,10 +23,11 @@ a = add s = status sl = status --long - l = log + l = log c = checkout cb = checkout -b b = branch + d = diff f = fetch r = rebase p = pull @@ -76,10 +77,14 @@ [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