summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-17 17:37:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-17 17:37:32 (GMT)
commitd2bfef22e42bed1f5092655b1b3c8c309179b914 (patch)
treedd8545b2c63cb86a1f5f37b146114da60d61d404
parentd25c58ce43f45734ef74595b1e6fba1199651699 (diff)
parent7e2010537e96d0a1144520222f20ba1dc3d61441 (diff)
downloadgit-d2bfef22e42bed1f5092655b1b3c8c309179b914.zip
git-d2bfef22e42bed1f5092655b1b3c8c309179b914.tar.gz
git-d2bfef22e42bed1f5092655b1b3c8c309179b914.tar.bz2
Sync with 1.7.12.4
-rw-r--r--Documentation/RelNotes/1.7.12.4.txt23
-rw-r--r--Documentation/git.txt3
2 files changed, 25 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.12.4.txt b/Documentation/RelNotes/1.7.12.4.txt
new file mode 100644
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 d1d227a..fbdd2a5 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.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],