X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/f53becdc1d9326824c04e88bda9a73f601f8e748..ccbb71911874084108954d62c689ea6ebba53958:/.config/git/config?ds=inline

diff --git a/.config/git/config b/.config/git/config
index 993b9a8..ac28a35 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,5 +1,10 @@
 [user]
 	name = Amin Bandali
+	email = bandali@gnu.org
+	signingKey = BE6273738E616D6D1B3A08E8A21A020248816103
+
+[commit]
+	gpgSign = true
 
 # [format]
 # 	signoff = true
@@ -18,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
@@ -28,15 +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 = "! \
-	  git config user.email 'bandali@gnu.org'; \
-	  git config user.signingKey 'BE6273738E616D6D1B3A08E8A21A020248816103'; \
-	  git config commit.gpgSign true"
-	kelar = "! \
-	  git config user.email 'bandali@kelar.org'; \
-	  git config user.signingKey 'BE6273738E616D6D1B3A08E8A21A020248816103'; \
-	  git config commit.gpgSign true"
-	work = config user.email 'amin.bandali@savoirfairelinux.com'
+	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
@@ -57,11 +59,11 @@
 # 	branch=true
 
 [github]
-	user = notbandali
+	user = bandali0
 
 [sendemail]
 	smtpuser = bandali
-	smtpserver = mail.kelar.org
+	smtpserver = fencepost.gnu.org
 	smtpserverport = 587
 	smtpencryption = tls
 	annotate = yes
@@ -70,4 +72,19 @@
 	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