summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-11-03 13:07:04 -0700
committerGitHub <noreply@github.com>2017-11-03 13:07:04 -0700
commitf81cee42f95155ea371f14bc5f1d34f5e223357b (patch)
tree0b7ba5cb0154ce704c6f447c0f42e13aae287770
parent7f0b5150c32994b4ad593505172c5834a984b087 (diff)
parentc5d1135047faa7885293d90dcd6c36b5861fabf5 (diff)
downloadchef-f81cee42f95155ea371f14bc5f1d34f5e223357b.tar.gz
Merge pull request #6559 from chef/tsmith_mailmap
Add mailmap entries for Tim Smith
-rw-r--r--.mailmap4
1 files changed, 4 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 614100091a..142d587a4e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -168,3 +168,7 @@ Peter Burkholder <pburkholder@chef.io> Peter Burkholder <peterb@getchef.com>
# JJ Ashgar
JJ Asghar <jj@chef.io> JJ Asghar <jj@getchef.com>
+
+# Tim Smith
+Tim Smith <tsmith@chef.io> Tim Smith <tim@cozy.co>
+Tim Smith <tsmith@chef.io> Tim Smith <tsmith84@gmail.co>