Nicolas Pitre has a new email address

npitre · gitster · commit 03aa8ff3be3b · 2009-09-14T02:23:36.000-07:00
Due to problems at cam.org, my nico@cam.org email address is no longer
valid.  From now on, nico@fluxnic.net should be used instead.

Signed-off-by: Nicolas Pitre &lt;nico@fluxnic.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/.mailmap b/.mailmap
@@ -41,6 +41,7 @@ Michele Ballabio <barra_cuda@katamail.com>
 Nanako Shiraishi <nanako3@bluebottle.com>
 Nanako Shiraishi <nanako3@lavabit.com>
 Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
+<nico@fluxnic.net> <nico@cam.org>
 Philippe Bruhat <book@cpan.org>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
 René Scharfe <rene.scharfe@lsrfire.ath.cx>
diff --git a/diff-delta.c b/diff-delta.c
@@ -4,7 +4,7 @@
  * This code was greatly inspired by parts of LibXDiff from Davide Libenzi
  * http://www.xmailserver.org/xdiff-lib.html
  *
- * Rewritten for GIT by Nicolas Pitre <nico@cam.org>, (C) 2005-2007
+ * Rewritten for GIT by Nicolas Pitre <nico@fluxnic.net>, (C) 2005-2007
  *
  * This code is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/git.spec.in b/git.spec.in
@@ -233,7 +233,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Mar 27 2007 Eygene Ryabinkin <rea-git@codelabs.ru>
 - Added the git-p4 package: Perforce import stuff.
 
-* Mon Feb 13 2007 Nicolas Pitre <nico@cam.org>
+* Mon Feb 13 2007 Nicolas Pitre <nico@fluxnic.net>
 - Update core package description (Git isn't as stupid as it used to be)
 
 * Mon Feb 12 2007 Junio C Hamano <junkio@cox.net>
diff --git a/patch-delta.c b/patch-delta.c
@@ -2,7 +2,7 @@
  * patch-delta.c:
  * recreate a buffer from a source and the delta produced by diff-delta.c
  *
- * (C) 2005 Nicolas Pitre <nico@cam.org>
+ * (C) 2005 Nicolas Pitre <nico@fluxnic.net>
  *
  * This code is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/progress.c b/progress.c
@@ -1,7 +1,7 @@
 /*
  * Simple text-based progress display module for GIT
  *
- * Copyright (c) 2007 by Nicolas Pitre <nico@cam.org>
+ * Copyright (c) 2007 by Nicolas Pitre <nico@fluxnic.net>
  *
  * This code is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/test-delta.c b/test-delta.c
@@ -1,7 +1,7 @@
 /*
  * test-delta.c: test code to exercise diff-delta.c and patch-delta.c
  *
- * (C) 2005 Nicolas Pitre <nico@cam.org>
+ * (C) 2005 Nicolas Pitre <nico@fluxnic.net>
  *
  * This code is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as

-Original file line number
+Diff line change
 Nanako Shiraishi <[email protected]>
 Nanako Shiraishi <[email protected]>
 Nguyễn Thái Ngọc Duy <[email protected]>
 +<[email protected]> <[email protected]>
 Philippe Bruhat <[email protected]>
 Ramsay Allan Jones <[email protected]>
 René Scharfe <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* This code was greatly inspired by parts of LibXDiff from Davide Libenzi`
`5`	`5`	`* http://www.xmailserver.org/xdiff-lib.html`
`6`	`6`	`*`
`7`		`- * Rewritten for GIT by Nicolas Pitre <nico@cam.org>, (C) 2005-2007`
	`7`	`+ * Rewritten for GIT by Nicolas Pitre <nico@fluxnic.net>, (C) 2005-2007`
`8`	`8`	`*`
`9`	`9`	`* This code is free software; you can redistribute it and/or modify`
`10`	`10`	`* it under the terms of the GNU General Public License version 2 as`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* patch-delta.c:`
`3`	`3`	`* recreate a buffer from a source and the delta produced by diff-delta.c`
`4`	`4`	`*`
`5`		`- * (C) 2005 Nicolas Pitre <nico@cam.org>`
	`5`	`+ * (C) 2005 Nicolas Pitre <nico@fluxnic.net>`
`6`	`6`	`*`
`7`	`7`	`* This code is free software; you can redistribute it and/or modify`
`8`	`8`	`* it under the terms of the GNU General Public License version 2 as`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* Simple text-based progress display module for GIT`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2007 by Nicolas Pitre <nico@cam.org>`
	`4`	`+ * Copyright (c) 2007 by Nicolas Pitre <nico@fluxnic.net>`
`5`	`5`	`*`
`6`	`6`	`* This code is free software; you can redistribute it and/or modify`
`7`	`7`	`* it under the terms of the GNU General Public License version 2 as`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* test-delta.c: test code to exercise diff-delta.c and patch-delta.c`
`3`	`3`	`*`
`4`		`- * (C) 2005 Nicolas Pitre <nico@cam.org>`
	`4`	`+ * (C) 2005 Nicolas Pitre <nico@fluxnic.net>`
`5`	`5`	`*`
`6`	`6`	`* This code is free software; you can redistribute it and/or modify`
`7`	`7`	`* it under the terms of the GNU General Public License version 2 as`