diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:34:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:34:25 -0700 |
| commit | 0bde8c0c1e53e2b2001f4ced58d3e66865758cea (patch) | |
| tree | 2fe55b27c11430a6a89197748c71abde92c7bee5 | |
| parent | 9c559d5b86389de2449cd3cd5d53afa14936a6df (diff) | |
| parent | 117eea7eaaeb5ecb77d9b7cebdb40b4e85f37374 (diff) | |
| download | git-0bde8c0c1e53e2b2001f4ced58d3e66865758cea.tar.gz | |
Sync with Git 1.8.3.4
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rw-r--r-- | Documentation/user-manual.txt | 4 | ||||
| -rw-r--r-- | builtin/apply.c | 2 | ||||
| -rwxr-xr-x | t/t6021-merge-criss-cross.sh | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index e9b4922110..3bdd56e8f4 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/Documentation/user-manual.txt b/Documentation/user-manual.txt index e364007d7c..fe723e4722 100644 --- 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 64310cd678..50912c928f 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. |