mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with Git 1.8.3.4

Browse Source
This commit is contained in:
Junio C Hamano
2013-07-22 11:34:25 -07:00
parent 9c559d5b86 117eea7eaa
commit 0bde8c0c1e
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git.txt
View File

@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: 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 * 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.3.txt[1.8.3.3],
link:RelNotes/1.8.3.2.txt[1.8.3.2], link:RelNotes/1.8.3.2.txt[1.8.3.2],
link:RelNotes/1.8.3.1.txt[1.8.3.1], link:RelNotes/1.8.3.1.txt[1.8.3.1],

4
Documentation/user-manual.txt
View File

@ -4675,5 +4675,5 @@ Write a chapter on using plumbing and writing scripts.
Alternates, clone -reference, etc. Alternates, clone -reference, etc.
More on recovery from repository corruption. See: More on recovery from repository corruption. See:
http://marc.theaimsgroup.com/?l=git&m=117263864820799&w=2 http://marc.info/?l=git&m=117263864820799&w=2
http://marc.theaimsgroup.com/?l=git&m=117147855503798&w=2 http://marc.info/?l=git&m=117147855503798&w=2

2
builtin/apply.c
View File

@ -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 * 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)) { if (unquote_c_style(&name, line, NULL)) {
strbuf_release(&name); strbuf_release(&name);

2
t/t6021-merge-criss-cross.sh
View File

@ -3,7 +3,7 @@
# Copyright (c) 2005 Fredrik Kuivinen # 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. # nice description of what this is about.