undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with 1.7.12.4

Browse Source
This commit is contained in:
Junio C Hamano 2012-10-17 10:37:32 -07:00
commit d2bfef22e4
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Documentation/RelNotes/1.7.12.4.txt Normal file
View File

@ -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.

3
Documentation/git.txt
View File

@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: 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.3.txt[1.7.12.3],
link:RelNotes/1.7.12.2.txt[1.7.12.2], 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.1.txt[1.7.12.1],