From adc3192ef95bd572f61a5a88cab260ee3ff75d47 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 5 Oct 2010 12:44:08 -0700 Subject: [PATCH] Martin Langhoff has a new e-mail address Signed-off-by: Junio C Hamano --- .mailmap | 2 +- Documentation/git-archimport.txt | 2 +- Documentation/git-cvsexportcommit.txt | 4 ++-- Documentation/git-cvsserver.txt | 4 ++-- git-cvsserver.perl | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.mailmap b/.mailmap index a8091eb5d..19c872623 100644 --- a/.mailmap +++ b/.mailmap @@ -36,7 +36,7 @@ Lars Doelle Lars Doelle Li Hong Lukas Sandström -Martin Langhoff +Martin Langhoff Michael Coleman Michael J Gruber Michael W. Olson diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index 4f358c8d6..2411ce5bf 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/git-archimport.txt @@ -109,7 +109,7 @@ OPTIONS Author ------ -Written by Martin Langhoff . +Written by Martin Langhoff . Documentation -------------- diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt index b2696efae..d25661eb2 100644 --- a/Documentation/git-cvsexportcommit.txt +++ b/Documentation/git-cvsexportcommit.txt @@ -114,11 +114,11 @@ $ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit Author ------ -Written by Martin Langhoff and others. +Written by Martin Langhoff and others. Documentation -------------- -Documentation by Martin Langhoff and others. +Documentation by Martin Langhoff and others. GIT --- diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt index f4472c61d..70cbb2cae 100644 --- a/Documentation/git-cvsserver.txt +++ b/Documentation/git-cvsserver.txt @@ -399,13 +399,13 @@ This program is copyright The Open University UK - 2006. Authors: - Martyn Smith -- Martin Langhoff +- Martin Langhoff with ideas and patches from participants of the git-list . Documentation -------------- -Documentation by Martyn Smith , Martin Langhoff , and Matthias Urlichs . +Documentation by Martyn Smith , Martin Langhoff , and Matthias Urlichs . GIT --- diff --git a/git-cvsserver.perl b/git-cvsserver.perl index e9f3037df..bd19b8553 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -8,7 +8,7 @@ #### Copyright The Open University UK - 2006. #### #### Authors: Martyn Smith -#### Martin Langhoff +#### Martin Langhoff #### #### #### Released under the GNU Public License, version 2. @@ -2680,7 +2680,7 @@ package GITCVS::log; #### Copyright The Open University UK - 2006. #### #### Authors: Martyn Smith -#### Martin Langhoff +#### Martin Langhoff #### #### @@ -2847,7 +2847,7 @@ package GITCVS::updater; #### Copyright The Open University UK - 2006. #### #### Authors: Martyn Smith -#### Martin Langhoff +#### Martin Langhoff #### #### -- 2.26.2