diff options
| author | Alan Pearce | 2017-05-13 10:03:30 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-05-13 10:03:30 +0200 |
| commit | 3dd9fad897305f1ed6edc2a880ffad2c888ae9d9 (patch) | |
| tree | 9d897ab39ef995808de04461e337a5d566917745 /git | |
| parent | f28fe7ef1170a5049f294974b57a6dc7292986b0 (diff) | |
| parent | 3b8e49259080ac24eb4015d9a8ce94aba753e123 (diff) | |
| download | nixfiles-3dd9fad897305f1ed6edc2a880ffad2c888ae9d9.tar.lz nixfiles-3dd9fad897305f1ed6edc2a880ffad2c888ae9d9.tar.zst nixfiles-3dd9fad897305f1ed6edc2a880ffad2c888ae9d9.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'git')
| -rw-r--r-- | git/.config/git/config | 8 | ||||
| -rw-r--r-- | git/.config/git/config-spotcap | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/git/.config/git/config b/git/.config/git/config index b0d56061..f3a62f67 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 00000000..a340c2ed --- /dev/null +++ b/git/.config/git/config-spotcap @@ -0,0 +1,2 @@ +[user] +email = alan.pearce@spotcap.com \ No newline at end of file |