diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:36:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:36:42 -0700 |
| commit | 7e2010537e96d0a1144520222f20ba1dc3d61441 (patch) | |
| tree | 1e24acfbfcc05aa57e8cb2cfe3ffe01cb100961d | |
| parent | e98fa647aa5673cc95b6e9be1fdc13c0afa2cb37 (diff) | |
| download | git-7e2010537e96d0a1144520222f20ba1dc3d61441.tar.gz | |
Git 1.7.12.4v1.7.12.4maint-1.7.12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/1.7.12.4.txt | 23 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
| l--------- | RelNotes | 2 |
4 files changed, 27 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.7.12.4.txt b/Documentation/RelNotes/1.7.12.4.txt new file mode 100644 index 0000000000..c6da3cc939 --- /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 d1d227a32d..fbdd2a5a6a 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], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index ecdbf905a3..74513903e8 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.12.3 +DEF_VER=v1.7.12.4 LF=' ' @@ -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 |