Commit Graph

16 Commits

Author SHA1 Message Date
Seth Tisue 188be3c3af Merge remote-tracking branch 'origin/2.12.x' into 2.13.x 2022-10-16 14:47:08 +02:00
Seth Tisue d53e251802 mailmap: condense Liang Yan entries 2022-10-13 09:35:04 -03:00
Seth Tisue 2a4f12ed1f update .mailmap 2022-09-01 13:20:08 -07:00
Seth Tisue 51c1e926ec update mailmap, post-2.13.5 2021-02-19 12:07:20 -08:00
Seth Tisue 39148e4ec3 mailmap updates 2020-11-17 10:11:15 -08:00
Jason Zaugg 2f4c8bad05 Merge commit '998541a92c' into merge/2.12.x-to-2.13.x-20200514 2020-05-14 09:46:18 +10:00
Seth Tisue 706ef1b291 add mailmap entry 2020-04-22 14:11:18 -07:00
Seth Tisue 998541a92c only one Mike Skells 2020-03-29 19:59:55 -07:00
Seth Tisue dd78c5e133 there is only one Diego
as much having three or four of @diesalbla around could improve
compiler performance, in reality we have only one

having these mailmap entries should prevent Diegos from multiplying
and proliferating when we're using `git shortlog -sn` for the
release notes
2019-08-05 15:02:07 -07:00
Harrison Houghton b87e2c5b3b
mailmap me! 2019-03-19 19:42:48 -04:00
Adriaan Moors da6b444592 update mailmap 2014-01-28 13:46:18 -08:00
Jason Zaugg 0fb4d46a88 A .mailmap entry for @huitseeker
Without this, the release notes generator considers him
as two distinct beings:

    List(F, r, a, n, c, ̧, o, i, s,  , G, a, r, i, l, l, o, t)
    List(F, r, a, n, ç, o, i, s,  , G, a, r, i, l, l, o, t)
2013-09-27 11:06:10 +02:00
Paul Phillips 88cbbe192a Fixing up the mailmap.
The format of the mailmap was wrong, and it was not
accomplishing its intended task. I fixed it, and then
obsessed/compulsed over the names for a while.

Here's how you can tell if you're accomplishing something
with the mailmap:

% git shortlog -nse |wc -l

Was 162, now 128.
2012-12-20 19:24:20 -08:00
Paul Phillips 106ca1b676 Merge remote-tracking branch 'origin/2.10.x' into merge-2.10.x
* origin/2.10.x: (31 commits)
  Implicit vars should have non-implicit setters.
  Deprecate `scala.tools.nsc.Phases` because it's dead-code.
  scaladoc Template: remove duplicate code and several usages of Option.get.
  adds scala-reflect.jar to MIMA in ant
  Test showing the absence of a forward reference
  update mailmap
  Remove dead code from `Global`.
  Cleanup MemberLookup. Better explain ambiguous link targets.
  typedIdent no longer destroys attachments
  fixes incorrect handling of Annotated in lazy copier
  simplifies checkBounds
  Recurse into instantiations when stripping type vars.
  Extract base scaladoc functionality for the IDE.
  Expand pattern match position tests.
  SI-6288 Remedy ill-positioned extractor binding.
  SI-6288 Fix positioning of label jumps
  SI-6288 Position argument of unapply
  Fixes SI-6758: force LazyAnnnotationInfo for DefDef and TypeDef
  SI-6795 Simplify errors related to "abstract override" on type members
  SI-6795 Adds negative check for "abstract override" on types in traits
  ...

Conflicts:
	.mailmap
	src/compiler/scala/tools/nsc/Global.scala
	src/compiler/scala/tools/nsc/ast/DocComments.scala
	src/compiler/scala/tools/nsc/doc/base/CommentFactoryBase.scala
	src/compiler/scala/tools/nsc/doc/html/page/Source.scala
	src/compiler/scala/tools/nsc/doc/html/page/Template.scala
	src/compiler/scala/tools/nsc/doc/model/LinkTo.scala
	src/compiler/scala/tools/nsc/doc/model/MemberLookup.scala
	src/compiler/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala
	src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/reflect/scala/reflect/runtime/JavaMirrors.scala
	test/scaladoc/run/links.scala
2012-12-20 14:47:50 -08:00
Adriaan Moors d29696adcf update mailmap 2012-12-14 11:53:09 -08:00
Daniel C. Sobral 1236f27ac1 Associate correct names to e-mails, correct or not
This is used by git log to produce names with certain formats, and
is used by the release notes tool as well. Helpful if you have commits
with Author not set correctly, as did I.

I'm also including Aleksandar Prokopec and his friend Aleksandar Pokopec,
as well as Pavel Pavlov, both of whom have commits appearing under more
than one name.

I'm not including others who have not set a full name, but don't have
commits appearing under more than one name.
2012-11-09 11:43:11 -02:00