From efe6de6e4018f5d23bab68053bfd297e7f398425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20B=C3=ADlka?= <neleai@seznam.cz>
Date: Mon, 22 Jul 2013 10:02:17 +0200
Subject: [PATCH 1/2] update URL to the marc.info mail archive
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
Documentation/user-manual.txt | 4 ++--
builtin/apply.c | 2 +-
t/t6021-merge-criss-cross.sh | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 644acce079d..0a1df5e5f58 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 ff01ebff3d2..a88c372de59 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 331b9b07d4e..d15b313d4b5 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.
From 117eea7eaaeb5ecb77d9b7cebdb40b4e85f37374 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jul 2013 11:21:34 -0700
Subject: [PATCH 2/2] Git 1.8.3.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git.txt | 3 ++-
GIT-VERSION-GEN | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 1f783028bc9..2664b52725b 100644
--- 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/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b8b84577356..b6b5daa607d 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.3.3
+DEF_VER=v1.8.3.4
LF='
'