@@ -, +, @@ --- .mailmap | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/.mailmap +++ a/.mailmap @@ -1,6 +1,6 @@ # This file maintains name/email mappings for git-shortlog use -# For more information on the use of this file see '$ git shortlog -h' -# Name to mail mapping: the name in the right column will be mapped to the email addy in the left +# For more information on the use of this file see: man git-shortlog +# Mail to name mapping: email at the right is mapped to name at the left James Mason Henri-Damien Laurent @@ -83,3 +83,5 @@ Fridolin Somers Fridolyn SOMERS + + --