summaryrefslogtreecommitdiffstats
path: root/mergetools/diffmerge
diff options
context:
space:
mode:
authorThomas Rast <trast@inf.ethz.ch>2013-10-13 16:07:49 +0200
committerJonathan Nieder <jrnieder@gmail.com>2013-10-13 23:28:27 +0200
commit22bbddeafe5d5285def3dda76b300efd1363db1e (patch)
treed26cbd7f1438e222eac0793d24ba147aa8c4a35c /mergetools/diffmerge
parentMerge branch 'tz/credential-netrc' (diff)
downloadgit-22bbddeafe5d5285def3dda76b300efd1363db1e.tar.xz
git-22bbddeafe5d5285def3dda76b300efd1363db1e.zip
.mailmap: switch to Thomas Rast's personal address
Normalize to my personal address, as my ETH addresses will expire soon. Also add my new corp account to be somewhat futureproof. Note that despite the private address being first, Google owns the copyright as long as I am employed there. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'mergetools/diffmerge')
0 files changed, 0 insertions, 0 deletions