Git 1.7.12.4

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

diff --git a/Documentation/RelNotes/1.7.12.4.txt b/Documentation/RelNotes/1.7.12.4.txt
new file mode 100644 (file)
index 0000000..c6da3cc
--- /dev/null
+++ b/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.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index d1d227a32d1b110239fc4a789839dd2dadc12d80..fbdd2a5a6a6fb58875397b49fb5cdd8041b48737 100644 (file)
--- 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:
 
 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
 
 * 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],
   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],

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ecdbf905a32288937e1a3eec65aa7f925ea30446..74513903e82e380eca58140945334ad75c36b972 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.7.12.3
+DEF_VER=v1.7.12.4

 
 LF='
 '
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 9cd9140a6b6e8ee15dc2b237795b1117b0140842..b1456c30bd7bf4cc12222779184ae88c434cdd64 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.12.3.txt
\ No newline at end of file
+Documentation/RelNotes/1.7.12.4.txt
\ No newline at end of file