Skip to content

Commit 0bde8c0

Browse files
committed
Sync with Git 1.8.3.4
2 parents 9c559d5 + 117eea7 commit 0bde8c0

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

Documentation/git.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
4343
branch of the `git.git` repository.
4444
Documentation for older releases are available here:
4545

46-
* link:v1.8.3.3/git.html[documentation for release 1.8.3.3]
46+
* link:v1.8.3.4/git.html[documentation for release 1.8.3.4]
4747

4848
* release notes for
49+
link:RelNotes/1.8.3.4.txt[1.8.3.4],
4950
link:RelNotes/1.8.3.3.txt[1.8.3.3],
5051
link:RelNotes/1.8.3.2.txt[1.8.3.2],
5152
link:RelNotes/1.8.3.1.txt[1.8.3.1],

Documentation/user-manual.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4675,5 +4675,5 @@ Write a chapter on using plumbing and writing scripts.
46754675
Alternates, clone -reference, etc.
46764676

46774677
More on recovery from repository corruption. See:
4678-
http://marc.theaimsgroup.com/?l=git&m=117263864820799&w=2
4679-
http://marc.theaimsgroup.com/?l=git&m=117147855503798&w=2
4678+
http://marc.info/?l=git&m=117263864820799&w=2
4679+
http://marc.info/?l=git&m=117147855503798&w=2

builtin/apply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ static char *find_name_gnu(const char *line, const char *def, int p_value)
473473

474474
/*
475475
* Proposed "new-style" GNU patch/diff format; see
476-
* http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
476+
* http://marc.info/?l=git&m=112927316408690&w=2
477477
*/
478478
if (unquote_c_style(&name, line, NULL)) {
479479
strbuf_release(&name);

t/t6021-merge-criss-cross.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2005 Fredrik Kuivinen
44
#
55

6-
# See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a
6+
# See http://marc.info/?l=git&m=111463358500362&w=2 for a
77
# nice description of what this is about.
88

99

0 commit comments

Comments
 (0)