[neomutt-devel] git .mailmap lookup file

Richard Russon rich at flatcap.org
Sun Apr 16 14:44:37 CEST 2017


I've just pushed an update to git's .mailmap file.
The mailmap is a "Real Name" / "Email address" lookup table.
    https://github.com/neomutt/neomutt/blob/master/.mailmap

It's used by "git shortlog" and "git log" %aN and %aE formats.
It means that all your different accounts are merged into one label.

NOTE:  All the identities in this file are taken from the git history,
       so they were already in the public domain.

Here's a sample:

## NeoMutt Contributors
John Doe <jd at example.com> John X Doe <jd at example.com>            # @jd
John Doe <jd at example.com> John Doe <jd at users.noreply.github.com> # @jd

Whichever account John uses, git will now display one version.

Example:
    # A summary of the changes since the last release
    git shortlog -sn neomutt-20170306..neomutt-20170414

   156  Richard Russon
    76  Kevin McCarthy
    15  Pietro Cerutti
     5  Bernard Pratz
     3  Damien Riegel
     3  Vincent Lefevre
     2  Dmitri Vereshchagin
     2  Matthias Andree
     2  Mehdi Abaakouk
     1  Ian Zimmerman
     1  Kevin Decherf
     1  Tobias Angele

The mailmap is also used by "git log".  Here a section of my .gitconfig

    [alias]
        ln     = log --format=named
    [pretty]
        named  = %C(204)%h%Creset %s -- %C(white dim)%aN <%aE>%Creset

# git ln
...
4feb98d add ident to PATCHES -- Richard Russon <rich at flatcap.org>
337f6e3 Change 'attach_keyword' option from string to regex -- Johannes Weißl <jargon at molb.org>
a46ef69 docs: Add badges to README.neomutt -- Tobias Angele <toogley at mailbox.org>
ae65f34 Sensible-browser behaviour fixes -- Pierre-Elliott Bécue <becue at crans.org>
c645be0 Don't abort the menu editor on sigwinch. (closes #3875) -- Kevin McCarthy <kevin at 8t8.us>
...

For fun, you can replace the first column of the upstream mutt section
like this:
    Upstream <dev at mutt.org>  Dev Name <real at address.com>

# Collapse all the upstream commits
git shortlog -sn neomutt-20170306..neomutt-20170414
   156  Richard Russon
    83  Upstream
    15  Pietro Cerutti
     5  Bernard Pratz
     3  Damien Riegel
     2  Mehdi Abaakouk
     1  Ian Zimmerman
     1  Kevin Decherf
     1  Tobias Angele

Or you could replace the first column with our github names:
    @flatcap <rich at flatcap.org>  Richard Russon <rich at flatcap.org>

# Use GitHub names instead
git shortlog -sn neomutt-20170306..neomutt-20170414
   156  @flatcap
    83  Upstream
    15  @gahr
     5  @guyzmo
     3  @d-k-c
     2  @sileht
     1  @kdecherf
     1  @nobrowser
     1  @toogley

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://mailman.neomutt.org/pipermail/neomutt-devel-neomutt.org/attachments/20170416/38e2a493/attachment.sig>


More information about the neomutt-devel mailing list