summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndřej Bílka <neleai@seznam.cz>2013-07-22 10:02:17 +0200
committerJunio C Hamano <gitster@pobox.com>2013-07-22 10:11:18 -0700
commitefe6de6e4018f5d23bab68053bfd297e7f398425 (patch)
tree30f12089e1b03cad2ad916ffb10f5077c6076850
parent31fe4057b17847a15d1fbe9f1a5521c942fa8ade (diff)
downloadgit-efe6de6e4018f5d23bab68053bfd297e7f398425.tar.gz
update URL to the marc.info mail archive
The name marc.theaimsgroup.com is no longer active, and has migrated to marc.info. Signed-off-by: Ondřej Bílka <neleai@seznam.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/user-manual.txt4
-rw-r--r--builtin/apply.c2
-rwxr-xr-xt/t6021-merge-criss-cross.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 644acce079..0a1df5e5f5 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4669,5 +4669,5 @@ Write a chapter on using plumbing and writing scripts.
Alternates, clone -reference, etc.
More on recovery from repository corruption. See:
- http://marc.theaimsgroup.com/?l=git&m=117263864820799&w=2
- http://marc.theaimsgroup.com/?l=git&m=117147855503798&w=2
+ http://marc.info/?l=git&m=117263864820799&w=2
+ http://marc.info/?l=git&m=117147855503798&w=2
diff --git a/builtin/apply.c b/builtin/apply.c
index ff01ebff3d..a88c372de5 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -473,7 +473,7 @@ static char *find_name_gnu(const char *line, const char *def, int p_value)
/*
* Proposed "new-style" GNU patch/diff format; see
- * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
+ * http://marc.info/?l=git&m=112927316408690&w=2
*/
if (unquote_c_style(&name, line, NULL)) {
strbuf_release(&name);
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 331b9b07d4..d15b313d4b 100755
--- a/t/t6021-merge-criss-cross.sh
+++ b/t/t6021-merge-criss-cross.sh
@@ -3,7 +3,7 @@
# Copyright (c) 2005 Fredrik Kuivinen
#
-# See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a
+# See http://marc.info/?l=git&m=111463358500362&w=2 for a
# nice description of what this is about.