summaryrefslogtreecommitdiffstats
path: root/.config/git
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.config/git/config15
-rw-r--r--.config/git/config.canonical2
-rw-r--r--.config/git/config.sfl2
3 files changed, 19 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
index fd440a6..ac28a35 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -73,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
diff --git a/.config/git/config.canonical b/.config/git/config.canonical
new file mode 100644
index 0000000..d88fe03
--- /dev/null
+++ b/.config/git/config.canonical
@@ -0,0 +1,2 @@
+[user]
+ email = amin.bandali@canonical.com
diff --git a/.config/git/config.sfl b/.config/git/config.sfl
new file mode 100644
index 0000000..34fb7f8
--- /dev/null
+++ b/.config/git/config.sfl
@@ -0,0 +1,2 @@
+[user]
+ email = amin.bandali@savoirfairelinux.com