summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-12-12 06:38:26 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-12 11:09:11 -0800
commitc4878fd924c922d12fdfe4e97e4559679342c583 (patch)
tree44281af01ea5a25696c7c29cd54a817459587dae /merge-recursive.c
parent.mailmap: fix broken entry for Martin Langhoff (diff)
downloadtgif-c4878fd924c922d12fdfe4e97e4559679342c583.tar.xz
.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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions