From bdfc6b364a51b19efbacbd46fcef5be41a5db50e Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Dec 2015 14:07:30 -0800
Subject: [PATCH] Git 2.6.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/RelNotes/2.6.4.txt | 15 +++++++++++++++
Documentation/git.txt | 3 ++-
GIT-VERSION-GEN | 2 +-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/Documentation/RelNotes/2.6.4.txt b/Documentation/RelNotes/2.6.4.txt
index 621eb953be..b0256a2dc9 100644
--- a/Documentation/RelNotes/2.6.4.txt
+++ b/Documentation/RelNotes/2.6.4.txt
@@ -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.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 900272b1c3..cbf157be43 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -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],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index abfdd9cb1d..f2a001f6c0 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.6.3
+DEF_VER=v2.6.4
LF='
'
--
GitLab