summary refs log tree commit diff stats
path: root/git/.config
diff options
context:
space:
mode:
Diffstat (limited to 'git/.config')
-rw-r--r--git/.config/git/config8
-rw-r--r--git/.config/git/config-spotcap2
2 files changed, 8 insertions, 2 deletions
diff --git a/git/.config/git/config b/git/.config/git/config
index b0d5606..f3a62f6 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -1,5 +1,5 @@
 [user]
-	email = alan@alanpearce.uk
+	email = alan@alanpearce.eu
 	name = Alan Pearce
 [color]
 	branch = auto
@@ -21,9 +21,13 @@
 	pr = pull-request
 	delete-merged = "!sh -c 'git branch --merged | grep -v "\\*" | grep -v master | grep -v dev | xargs -n 1 git branch -d'"
 [github]
-	user = alan@alanpearce.uk
+	user = alan@alanpearce.eu
 [ghq "ssh://alanpearce.eu/"]
   vcs = git
+[includeIf "gitdir:github.com/Spotcap/"]
+  path = config-spotcap
+[includeIf "gitdir:bitbucket.org/spotcap-engineering/"]
+  path = config-spotcap
 [diff]
 	algorithm = patience
 [include]
diff --git a/git/.config/git/config-spotcap b/git/.config/git/config-spotcap
new file mode 100644
index 0000000..a340c2e
--- /dev/null
+++ b/git/.config/git/config-spotcap
@@ -0,0 +1,2 @@
+[user]
+email = alan.pearce@spotcap.com
\ No newline at end of file