summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-29 21:18:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-29 21:19:11 (GMT)
commit60115f54bda3a127ed3cc8ffc6ab6c771cbceb1b (patch)
tree339eca7763290c32a8f711a5b63103f6d312855d
parent0c1a8ec8da53c3d5c7ce1fae8599f18bce6a4b2d (diff)
downloadgit-60115f54bda3a127ed3cc8ffc6ab6c771cbceb1b.zip
git-60115f54bda3a127ed3cc8ffc6ab6c771cbceb1b.tar.gz
git-60115f54bda3a127ed3cc8ffc6ab6c771cbceb1b.tar.bz2
Git 2.8.2v2.8.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.8.2.txt15
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 19 insertions, 3 deletions
diff --git a/Documentation/RelNotes/2.8.2.txt b/Documentation/RelNotes/2.8.2.txt
index 3db67f4..447b193 100644
--- a/Documentation/RelNotes/2.8.2.txt
+++ b/Documentation/RelNotes/2.8.2.txt
@@ -52,4 +52,19 @@ Fixes since v2.8.1
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
+ * Build updates for MSVC.
+
+ * "git diff -M" used to work better when two originally identical
+ files A and B got renamed to X/A and X/B by pairing A to X/A and B
+ to X/B, but this was broken in the 2.0 timeframe.
+
+ * "git send-pack --all <there>" was broken when its command line
+ option parsing was written in the 2.6 timeframe.
+
+ * When running "git blame $path" with unnormalized data in the index
+ for the path, the data in the working tree was blamed, even though
+ "git add" would not have changed what is already in the index, due
+ to "safe crlf" that disables the line-end conversion. It has been
+ corrected.
+
Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8afe349..34ff007 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.8.1/git.html[documentation for release 2.8.1]
+* link:v2.8.2/git.html[documentation for release 2.8.2]
* release notes for
+ link:RelNotes/2.8.2.txt[2.8.2].
link:RelNotes/2.8.1.txt[2.8.1].
link:RelNotes/2.8.0.txt[2.8].
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 46595da..5f99f23 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.8.1
+DEF_VER=v2.8.2
LF='
'
diff --git a/RelNotes b/RelNotes
index d40c3e1..04710da 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.8.1.txt \ No newline at end of file
+Documentation/RelNotes/2.8.2.txt \ No newline at end of file