From: Eric Wong Date: Thu, 04 Apr 2013 01:50:42 GMT Subject: [PATCH] update pasky's email address Message-ID: <20130404015042.GA19593@dcvr.yhbt.net> Mail to pasky@suse.cz is bouncing. Signed-off-by: Eric Wong --- I noticed this when I attempted to reply to Thomas's email: http://mid.gmane.org/f3d238a4c6cfbc6d68f2c4fa285aefa93acf4b7d.1365027616.git.trast@inf.ethz.ch .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 Peter Krefting Peter Krefting +Petr Baudis Philippe Bruhat Ralf Thielow Ramsay Allan Jones 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 To: git@vger.kernel.org -Cc: Petr Baudis , Linus Torvalds +Cc: Petr Baudis , Linus Torvalds 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 writes: +Petr Baudis writes: > Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter > where Junio C Hamano 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 -// 2007, Petr Baudis +// 2007, Petr Baudis // 2008-2011, Jakub Narebski /** 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 -// 2007, Petr Baudis +// 2007, Petr Baudis // 2008-2011, Jakub Narebski /** 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 -// 2007, Petr Baudis +// 2007, Petr Baudis // 2008-2011, Jakub Narebski /** 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 -// 2007, Petr Baudis +// 2007, Petr Baudis // 2008-2011, Jakub Narebski /** 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 Epasky@suse.czE. +Copyright 2006 by Petr Baudis Epasky@ucw.czE. This module is free software; it may be used, copied, modified and distributed under the terms of the GNU General Public Licence, -- Eric Wong