]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

use git shortlog and .mailmap to remove duplicates
authorValentin Haenel <valentin.haenel@gmx.de>
Mon, 4 Jun 2012 14:08:48 +0000 (16:08 +0200)
committerValentin Haenel <valentin.haenel@gmx.de>
Tue, 5 Jun 2012 16:31:06 +0000 (18:31 +0200)
When using the basic log command one of the authors shows up twice:

zsh» git log --all --format='%an <%ae>' | sort -u -k2
Vincent Demeester <vincent@demeester.fr>
Richard Hartmann <richih+github.com@richih.org>
Richard Hartmann <richih.mailinglist@gmail.com>
Dieter Plaetinck <dieter@plaetinck.be>
Corey Quinn <corey@sequestered.net>
Gernot Schulz <post@gernot-schulz.com>

If you instead use the git shortlog version with the .mailmap file you get:

zsh» git shortlog -se --all | cut -f1 --complement | sort -u -k2

Vincent Demeester <vincent@demeester.fr>
Richard Hartmann <richih.mailinglist@gmail.com>
Dieter Plaetinck <dieter@plaetinck.be>
Corey Quinn <corey@sequestered.net>
Gernot Schulz <post@gernot-schulz.com>

Alphabetical sorting on the second field (which, incidentally, may be a middle
name) is preserved.

.mailmap [new file with mode: 0644]
tools/list_AUTHORS

diff --git a/.mailmap b/.mailmap
new file mode 100644 (file)
index 0000000..bf08497
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Richard Hartmann <richih.mailinglist@gmail.com> <richih+github.com@richih.org>
index 2b91ac97945b45ad539e2d00882c6b864009671e..351820564a77614b5b10f335d38cf5ba549d76fa 100755 (executable)
@@ -2,4 +2,4 @@
 
 echo 'Alphabetical list of everyone who ever committed to this repository
 '
-git log --all --format='%an <%ae>' | sort -u -k2
+git shortlog -se --all | cut -f1 --complement | sort -u -k2