diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:37:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:37:32 -0700 |
commit | d2bfef22e42bed1f5092655b1b3c8c309179b914 (patch) | |
tree | dd8545b2c63cb86a1f5f37b146114da60d61d404 /Documentation/RelNotes | |
parent | d25c58ce43f45734ef74595b1e6fba1199651699 (diff) | |
parent | 7e2010537e96d0a1144520222f20ba1dc3d61441 (diff) | |
download | git-d2bfef22e42bed1f5092655b1b3c8c309179b914.tar.gz git-d2bfef22e42bed1f5092655b1b3c8c309179b914.tar.xz |
Sync with 1.7.12.4
Diffstat (limited to 'Documentation/RelNotes')
-rw-r--r-- | Documentation/RelNotes/1.7.12.4.txt | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.12.4.txt b/Documentation/RelNotes/1.7.12.4.txt new file mode 100644 index 000000000..c6da3cc93 --- /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. |