Sync with Git 1.8.3.4

diff --git a/Documentation/git.txt b/Documentation/git.txt
index e9b4922110012eec5b6d5874b81685261565bdd1..3bdd56e8f41bbe1fa695c5ef03a7c6d253e7af62 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.8.3.3/git.html[documentation for release 1.8.3.3]
+* link:v1.8.3.4/git.html[documentation for release 1.8.3.4]
 
 * release notes for
+  link:RelNotes/1.8.3.4.txt[1.8.3.4],
   link:RelNotes/1.8.3.3.txt[1.8.3.3],
   link:RelNotes/1.8.3.2.txt[1.8.3.2],
   link:RelNotes/1.8.3.1.txt[1.8.3.1],

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index e364007d7c2e5f9b1aa5472c7968cb248eb8cf3f..fe723e472275dc8989338be9a1bc592a4dd18425 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4675,5 +4675,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 64310cd678d67c88de459e99ba577a1228378fa4..50912c928f79cc0bcb4acf3ae50fd9fdc32193e8 100644 (file)
--- 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 331b9b07d4eedb07377de605ebb87691427b7bb4..d15b313d4b5e65bc583b7c1f0e4efbb5ac56cb00 100755 (executable)
--- 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.