mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 01:56:15 +02:00
Code

Git 1.7.12.4 

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-10-17 10:36:01 -07:00
parent e98fa647aa
commit 7e2010537e
4 changed files with 27 additions and 3 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.
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],

2
GIT-VERSION-GEN
View File

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

2
RelNotes
View File

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