diff --git a/.mailmap b/.mailmap index f9154ac..42a86fd 100644 --- a/.mailmap +++ b/.mailmap @@ -1,4 +1,3 @@ -Sam Hatchett James Uber Demetrios Eliades Hyoungmin Woo @@ -10,4 +9,12 @@ Elad Salomons Angela Marchi Angela Marchi Bryant McDonnell -Marios Kyriakou +Marios Kyriakou +Marios Kyriakou +Sam Hatchett +Sam Hatchett +Markus Sunela +Markus Sunela <30700548+makusuko@users.noreply.github.com> +Lew Rossman +Lew Rossman +Michael Tryby michaeltryby diff --git a/AUTHORS b/AUTHORS index 0a3fafe..2a74cc9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,8 +1,8 @@ # Authors ordered by first contribution. -# Generated by tools/update-authors.sh +# (Mostly) Generated by tools/update-authors.sh -Lew Rossman *** -Michael Tryby *** +Lew Rossman +Michael Tryby Sam Hatchett Feng Shang James Uber @@ -19,7 +19,8 @@ Elad Salomons Maurizio Cingi Bryant McDonnell Angela Marchi +Lew Rossman Markus Sunela -mariosmsk +Milad Ghiami -*** = works in the public domain \ No newline at end of file +*** some works are in the public domain, all others licensed under terms: see LICENSE diff --git a/tools/update-authors.sh b/tools/update-authors.sh index 7bddff2..4abe57b 100755 --- a/tools/update-authors.sh +++ b/tools/update-authors.sh @@ -25,8 +25,12 @@ END { print "# Authors ordered by first contribution.\n"; print "# Generated by tools/update-authors.sh\n"; print "\n", @authors; - print "\n*** = works in the public domain"; + print "\n*** some works are in the public domain, all others licensed under terms: see LICENSE"; } ' + +echo "\n\nSome commits are co-authored:\n" + +git log | grep Co-Author