Skip to content

Commit

Permalink
Git 1.7.11.5
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
gitster committed Aug 15, 2012
1 parent d7d3b56 commit cd7c0be
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
8 changes: 8 additions & 0 deletions Documentation/RelNotes/1.7.11.5.txt
Expand Up @@ -7,6 +7,10 @@ Fixes since v1.7.11.4
* The Makefile rule to create assembly output (primarily for
debugging purposes) did not create it next to the source.

* The code to avoid mistaken attempt to add the object directory
itself as its own alternate could read beyond end of a string while
comparison.

* On some architectures, "block-sha1" did not compile correctly
when compilers inferred alignment guarantees from our source we
did not intend to make.
Expand All @@ -25,4 +29,8 @@ Fixes since v1.7.11.4
* "git mergetool" did not support --tool-help option to give the list
of supported backends, like "git difftool" does.

* "git grep" stopped spawning an external "grep" long time ago, but a
duplicated test to check internal and external "grep" was left
behind.

Also contains minor typofixes and documentation updates.
3 changes: 2 additions & 1 deletion Documentation/git.txt
Expand Up @@ -44,9 +44,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.11.4/git.html[documentation for release 1.7.11.4]
* link:v1.7.11.5/git.html[documentation for release 1.7.11.5]

* release notes for
link:RelNotes/1.7.11.5.txt[1.7.11.5],
link:RelNotes/1.7.11.4.txt[1.7.11.4],
link:RelNotes/1.7.11.3.txt[1.7.11.3],
link:RelNotes/1.7.11.2.txt[1.7.11.2],
Expand Down
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh

GVF=GIT-VERSION-FILE
DEF_VER=v1.7.11.4
DEF_VER=v1.7.11.5

LF='
'
Expand Down

0 comments on commit cd7c0be

Please sign in to comment.