Mail to pasky@xxxxxxx is bouncing. Signed-off-by: Eric Wong <normalperson@xxxxxxxx> --- I noticed this when I attempted to reply to Thomas's email: http://mid.gmane.org/f3d238a4c6cfbc6d68f2c4fa285aefa93acf4b7d.1365027616.git.trast@xxxxxxxxxxx .mailmap | 1 + Documentation/howto/rebase-from-internal-branch.txt | 4 ++-- gitweb/static/js/blame_incremental.js | 2 +- gitweb/static/js/javascript-detection.js | 2 +- gitweb/static/js/lib/common-lib.js | 2 +- gitweb/static/js/lib/datetime.js | 2 +- perl/Git.pm | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index c7e8618..1f01263 100644 --- a/.mailmap +++ b/.mailmap @@ -73,6 +73,7 @@ Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> <nico@xxxxxxxxxxx> <nico@xxxxxxx> Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxx> +Petr Baudis <pasky@xxxxxx> <pasky@xxxxxxx> Philippe Bruhat <book@xxxxxxxx> Ralf Thielow <ralf.thielow@xxxxxxxxx> <ralf.thielow@xxxxxxxxxxxxxx> Ramsay Allan Jones <ramsay@xxxxxxxxxxxxxxxxxxx> diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt index 19ab604..914d011 100644 --- a/Documentation/howto/rebase-from-internal-branch.txt +++ b/Documentation/howto/rebase-from-internal-branch.txt @@ -1,6 +1,6 @@ From: Junio C Hamano <gitster@xxxxxxxxx> To: git@xxxxxxxxxxxxxxx -Cc: Petr Baudis <pasky@xxxxxxx>, Linus Torvalds <torvalds@xxxxxxxx> +Cc: Petr Baudis <pasky@xxxxxx>, Linus Torvalds <torvalds@xxxxxxxx> Subject: Re: sending changesets from the middle of a git tree Date: Sun, 14 Aug 2005 18:37:39 -0700 Abstract: In this article, JC talks about how he rebases the @@ -14,7 +14,7 @@ How to rebase from an internal branch ===================================== -------------------------------------- -Petr Baudis <pasky@xxxxxxx> writes: +Petr Baudis <pasky@xxxxxx> writes: > Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter > where Junio C Hamano <junkio@xxxxxxx> told me that... diff --git a/gitweb/static/js/blame_incremental.js b/gitweb/static/js/blame_incremental.js index db6eb50..e162ec9 100644 --- a/gitweb/static/js/blame_incremental.js +++ b/gitweb/static/js/blame_incremental.js @@ -1,5 +1,5 @@ // Copyright (C) 2007, Fredrik Kuivinen <frekui@xxxxxxxxx> -// 2007, Petr Baudis <pasky@xxxxxxx> +// 2007, Petr Baudis <pasky@xxxxxx> // 2008-2011, Jakub Narebski <jnareb@xxxxxxxxx> /** diff --git a/gitweb/static/js/javascript-detection.js b/gitweb/static/js/javascript-detection.js index fa2596f..3da2d2e 100644 --- a/gitweb/static/js/javascript-detection.js +++ b/gitweb/static/js/javascript-detection.js @@ -1,5 +1,5 @@ // Copyright (C) 2007, Fredrik Kuivinen <frekui@xxxxxxxxx> -// 2007, Petr Baudis <pasky@xxxxxxx> +// 2007, Petr Baudis <pasky@xxxxxx> // 2008-2011, Jakub Narebski <jnareb@xxxxxxxxx> /** diff --git a/gitweb/static/js/lib/common-lib.js b/gitweb/static/js/lib/common-lib.js index 018bbb7..9c3c465 100644 --- a/gitweb/static/js/lib/common-lib.js +++ b/gitweb/static/js/lib/common-lib.js @@ -1,5 +1,5 @@ // Copyright (C) 2007, Fredrik Kuivinen <frekui@xxxxxxxxx> -// 2007, Petr Baudis <pasky@xxxxxxx> +// 2007, Petr Baudis <pasky@xxxxxx> // 2008-2011, Jakub Narebski <jnareb@xxxxxxxxx> /** diff --git a/gitweb/static/js/lib/datetime.js b/gitweb/static/js/lib/datetime.js index f78c60a..fdd46d3 100644 --- a/gitweb/static/js/lib/datetime.js +++ b/gitweb/static/js/lib/datetime.js @@ -1,5 +1,5 @@ // Copyright (C) 2007, Fredrik Kuivinen <frekui@xxxxxxxxx> -// 2007, Petr Baudis <pasky@xxxxxxx> +// 2007, Petr Baudis <pasky@xxxxxx> // 2008-2011, Jakub Narebski <jnareb@xxxxxxxxx> /** diff --git a/perl/Git.pm b/perl/Git.pm index 96cac39..7802afc 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -1434,7 +1434,7 @@ sub git_cmd_try(&$) { =head1 COPYRIGHT -Copyright 2006 by Petr Baudis E<lt>pasky@xxxxxxxx<gt>. +Copyright 2006 by Petr Baudis E<lt>pasky@xxxxxxx<gt>. This module is free software; it may be used, copied, modified and distributed under the terms of the GNU General Public Licence, -- Eric Wong -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html