X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/ca3a844af240ca87882522d14b530e0f1a6327ef..ccbb71911874084108954d62c689ea6ebba53958:/.config/git/config diff --git a/.config/git/config b/.config/git/config index 2cef2a2..ac28a35 100644 --- 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 @@ -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 = notbandali + user = bandali0 [sendemail] smtpuser = bandali @@ -64,3 +70,21 @@ [transfer] fsckObjects = true + +[init] + 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