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)
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.
* 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
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.
Adriaan Moors