Skip to content

Commit

Permalink
Git 2.6.4
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 Dec 8, 2015
1 parent 4d0069f commit bdfc6b3
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
15 changes: 15 additions & 0 deletions Documentation/RelNotes/2.6.4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,20 @@ Fixes since v2.6.3
computing the object name of the target of symbolic link, which may
not even exist or may be a directory.

* There was no way to defeat a configured rebase.autostash variable
from the command line, as "git rebase --no-autostash" was missing.

* Allow "git interpret-trailers" to run outside of a Git repository.

* Produce correct "dirty" marker for shell prompts, even when we
are on an orphan or an unborn branch.

* Some corner cases have been fixed in string-matching done in "git
status".

* Apple's common crypto implementation of SHA1_Update() does not take
more than 4GB at a time, and we now have a compile-time workaround
for it.

Also contains typofixes, documentation updates and trivial code
clean-ups.
3 changes: 2 additions & 1 deletion Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:

* link:v2.6.3/git.html[documentation for release 2.6.3]
* link:v2.6.4/git.html[documentation for release 2.6.4]

* release notes for
link:RelNotes/2.6.4.txt[2.6.4],
link:RelNotes/2.6.3.txt[2.6.3],
link:RelNotes/2.6.2.txt[2.6.2],
link:RelNotes/2.6.1.txt[2.6.1],
Expand Down
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

GVF=GIT-VERSION-FILE
DEF_VER=v2.6.3
DEF_VER=v2.6.4

LF='
'
Expand Down

0 comments on commit bdfc6b3

Please sign in to comment.