summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <stefanbeller@googlemail.com>2013-07-17 22:16:31 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-17 18:11:27 -0700
commitc07a6bc57255a2d00b41333f570b64cc36c70cfb (patch)
treeb88caaf2ad7631aaacd14655d7baa48e09d886aa /Documentation/merge-options.txt
parent.mailmap: Combine more (email, name) to individual persons (diff)
downloadtgif-c07a6bc57255a2d00b41333f570b64cc36c70cfb.tar.xz
.mailmap: combine more (email, name) to individual persons
I got more responses from people regarding the .mailmap file. All added persons gave permission to add them to the .mailmap file. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions