summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-12-12 06:38:26 -0500
committerJunio C Hamano <gitster@pobox.com>2012-12-12 11:09:11 -0800
commitc4878fd924c922d12fdfe4e97e4559679342c583 (patch)
tree44281af01ea5a25696c7c29cd54a817459587dae /git-merge-octopus.sh
parent32d979eaf5a9bbe770aa27e1a8cfed1eeb0969e1 (diff)
downloadgit-c4878fd924c922d12fdfe4e97e4559679342c583.tar.gz
.mailmap: normalize emails for Jeff King
I never meant anything special by using my @github.com address; it is merely a mistake that it has sometimes bled through to patches. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions