From c586ed0ec710bfd03dfa5e51333e5494ec247f12 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 10 May 2017 14:47:57 +0200 Subject: Git: Add configuration for spotcap repositories --- git/.config/git/config | 4 ++++ git/.config/git/config-spotcap | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 git/.config/git/config-spotcap (limited to 'git') diff --git a/git/.config/git/config b/git/.config/git/config index b0d5606..579c226 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -24,6 +24,10 @@ user = alan@alanpearce.uk [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 -- cgit 1.4.1 From 56b360cb19bb36c4be4b7d3b4013e519f1f0b9c3 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 10 May 2017 15:00:32 +0200 Subject: Update email addresses --- emacs/.emacs.d/init.org | 2 +- git/.config/git/config | 4 ++-- hg/.hgrc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'git') diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index 6f6b753..7cdf209 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -37,7 +37,7 @@ the buffer to be empty. ** Personal Information #+BEGIN_SRC emacs-lisp -(setq user-mail-address "alan@alanpearce.co.uk" +(setq user-mail-address "alan@alanpearce.eu" user-full-name "Alan Pearce") #+end_src diff --git a/git/.config/git/config b/git/.config/git/config index 579c226..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,7 +21,7 @@ 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/"] diff --git a/hg/.hgrc b/hg/.hgrc index 2f16f27..9cd0315 100644 --- a/hg/.hgrc +++ b/hg/.hgrc @@ -1,5 +1,5 @@ [ui] -username = Alan Pearce +username = Alan Pearce [extensions] purge = -- cgit 1.4.1