X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/81e04d6f2178f1b972538c6c578ba51d35af70f0..ccbb71911874084108954d62c689ea6ebba53958:/.config/git/config

diff --git a/.config/git/config b/.config/git/config
index 136a339..ac28a35 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -27,6 +27,7 @@
 	c = checkout
 	cb = checkout -b
 	b = branch
+	f = fetch
 	r = rebase
 	p = pull
 	pr = pull --rebase
@@ -72,3 +73,18 @@
 
 [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