Git 1.7.12.4

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

Author: gitster

Documentation/RelNotes/1.7.12.4.txt

@@ -0,0 +1,23 @@
+Git 1.7.12.4 Release Notes
+==========================
+
+Fixes since v1.7.12.3
+---------------------
+
+ * "git fetch" over the dumb-http revision walker could segfault when
+   curl's multi interface was used.
+
+ * It was possible to give specific paths for "asciidoc" and other
+   tools in the documentation toolchain, but not for "xmlto".
+
+ * "gitweb" did not give the correct committer timezone in its feed
+   output due to a typo.
+
+ * The "-Xours" (and similarly -Xtheirs) backend option to "git
+   merge -s recursive" was ignored for binary files.  Now it is
+   honored.
+
+ * The "binary" synthetic attribute made "diff" to treat the path as
+   binary, but not "merge".
+
+Also contains many documentation updates.

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.7.12.3/git.html[documentation for release 1.7.12.3]
+* link:v1.7.12.4/git.html[documentation for release 1.7.12.4]
 
 * release notes for
+  link:RelNotes/1.7.12.4.txt[1.7.12.4],
   link:RelNotes/1.7.12.3.txt[1.7.12.3],
   link:RelNotes/1.7.12.2.txt[1.7.12.2],
   link:RelNotes/1.7.12.1.txt[1.7.12.1],

GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.12.3
+DEF_VER=v1.7.12.4
 
 LF='
 '

RelNotes

@@ -1 +1 @@
-Documentation/RelNotes/1.7.12.3.txt
+Documentation/RelNotes/1.7.12.4.txt