"brian m. carlson" <[email protected]> writes: > An earlier change, cdb6b5ac (".mailmap: Combine more (name, email) to > individual persons", 2013-08-12), noted that there were two name > spellings and two email addresses and mapped the crustytoothpaste.net > address to the crustytoothpaste.ath.cx address. The latter is an older, > obsolete address, while the former is current, so switch the order of > the addresses so that git log displays the correct address. > > Signed-off-by: brian m. carlson <[email protected]> > --- > I intentionally avoided the use of the first person here, because I > wasn't sure what the preference of the list was on that. Hopefully it > reads naturally and isn't awkward. > > If not, I can send a v3.
Nah, the updated text is perfect. Thanks, will replace. > > .mailmap | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/.mailmap b/.mailmap > index 7c71e88ea5..df7cf6313c 100644 > --- a/.mailmap > +++ b/.mailmap > @@ -25,8 +25,8 @@ Ben Walton <[email protected]> <[email protected]> > Benoit Sigoure <[email protected]> <[email protected]> > Bernt Hansen <[email protected]> <[email protected]> > Brandon Casey <[email protected]> <[email protected]> > -brian m. carlson <[email protected]> Brian M. Carlson > <[email protected]> > -brian m. carlson <[email protected]> > <[email protected]> > +brian m. carlson <[email protected]> Brian M. Carlson > <[email protected]> > +brian m. carlson <[email protected]> > <[email protected]> > Bryan Larsen <[email protected]> <[email protected]> > Bryan Larsen <[email protected]> <[email protected]> > Cheng Renquan <[email protected]>
