Git 1.7.12.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Oct 17, 2012 at 10:36 UTC 7e2010537e96d0a1144520222f20ba1dc3d61441
4 files changed +27 -3
Documentation/RelNotes/1.7.12.4.txt new
+23
@@ -0,0 +1,23 @@
1 +Git 1.7.12.4 Release Notes
2 +==========================
3 +
4 +Fixes since v1.7.12.3
5 +---------------------
6 +
7 + * "git fetch" over the dumb-http revision walker could segfault when
8 + curl's multi interface was used.
9 +
10 + * It was possible to give specific paths for "asciidoc" and other
11 + tools in the documentation toolchain, but not for "xmlto".
12 +
13 + * "gitweb" did not give the correct committer timezone in its feed
14 + output due to a typo.
15 +
16 + * The "-Xours" (and similarly -Xtheirs) backend option to "git
17 + merge -s recursive" was ignored for binary files. Now it is
18 + honored.
19 +
20 + * The "binary" synthetic attribute made "diff" to treat the path as
21 + binary, but not "merge".
22 +
23 +Also contains many documentation updates.
Documentation/git.txt
+2 -1
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
43 branch of the `git.git` repository.
44 Documentation for older releases are available here:
45
46 -* link:v1.7.12.3/git.html[documentation for release 1.7.12.3]
46 +* link:v1.7.12.4/git.html[documentation for release 1.7.12.4]
47
48 * release notes for
49 + link:RelNotes/1.7.12.4.txt[1.7.12.4],
50 link:RelNotes/1.7.12.3.txt[1.7.12.3],
51 link:RelNotes/1.7.12.2.txt[1.7.12.2],
52 link:RelNotes/1.7.12.1.txt[1.7.12.1],
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v1.7.12.3
4 +DEF_VER=v1.7.12.4
5
6 LF='
7 '
RelNotes
+1 -1
@@ -1 +1 @@
1 -Documentation/RelNotes/1.7.12.3.txt
\ No newline at end of file
1 +Documentation/RelNotes/1.7.12.4.txt
\ No newline at end of file