diff options
Diffstat (limited to '')
| -rw-r--r-- | .config/git/config | 10 | ||||
| -rw-r--r-- | .config/git/config.canonical | 6 | ||||
| -rw-r--r-- | .config/git/config.gnu | 8 |
3 files changed, 19 insertions, 5 deletions
diff --git a/.config/git/config b/.config/git/config index e0b8d84..1363dc2 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,6 +1,6 @@ [user] name = Amin Bandali - email = bandali@gnu.org + email = bandali@kelar.org signingKey = BE6273738E616D6D1B3A08E8A21A020248816103 [tag] @@ -63,8 +63,8 @@ user = bandali0 [sendemail] - smtpuser = bandali - smtpserver = fencepost.gnu.org + smtpuser = bandali@kelar.org + smtpserver = mail.kelar.org smtpserverport = 587 smtpencryption = tls annotate = yes @@ -81,14 +81,14 @@ 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:~/src/gnu/"] + path = ~/.config/git/config.gnu [includeIf "gitdir:~/src/canonical/"] path = ~/.config/git/config.canonical [includeIf "gitdir:~/src/sfl/"] diff --git a/.config/git/config.canonical b/.config/git/config.canonical index 6d276f5..86f1a78 100644 --- a/.config/git/config.canonical +++ b/.config/git/config.canonical @@ -1,2 +1,8 @@ [user] email = bandali@canonical.com + +[sendemail] + smtpuser = bandali + smtpserver = smtp.canonical.com + smtpserverport = 587 + smtpencryption = tls diff --git a/.config/git/config.gnu b/.config/git/config.gnu new file mode 100644 index 0000000..1492065 --- /dev/null +++ b/.config/git/config.gnu @@ -0,0 +1,8 @@ +[user] + email = bandali@gnu.org + +[sendemail] + smtpuser = bandali + smtpserver = fencepost.gnu.org + smtpserverport = 587 + smtpencryption = tls |