summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-06 14:59:12 -0800
committerJunio C Hamano <gitster@pobox.com>2015-03-06 14:59:12 -0800
commit2588882df9541e4ef2e1fb56e86499283301fbd5 (patch)
tree91dcf6079320ef4f8348bf37b3c43c61c0fc2f45
parent83036f8541ad8999974863db9d2ac02a814e6395 (diff)
parent1165ae6f3d42e0eb0ddfc2d4e6dfa8bd0b88eb60 (diff)
downloadgit-2588882df9541e4ef2e1fb56e86499283301fbd5.tar.gz
Sync with 2.3.2
* maint: Git 2.3.2
-rw-r--r--Documentation/RelNotes/2.3.2.txt11
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
3 files changed, 14 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.3.2.txt b/Documentation/RelNotes/2.3.2.txt
index 357bf8364b..f4caf54927 100644
--- a/Documentation/RelNotes/2.3.2.txt
+++ b/Documentation/RelNotes/2.3.2.txt
@@ -65,4 +65,15 @@ Fixes since v2.3.1
heuristics. The tests and their prerequisites have been updated to
check what they really require.
+ * The configuration variable 'mailinfo.scissors' was hard to
+ discover in the documentation.
+
+ * Correct a breakage to git-svn around v2.2 era that triggers
+ premature closing of FileHandle.
+
+ * Even though we officially haven't dropped Perl 5.8 support, the
+ Getopt::Long package that came with it does not support "--no-"
+ prefix to negate a boolean option; manually add support to help
+ people with older Getopt::Long package.
+
Also contains typofixes, documentation updates and trivial code clean-ups.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index b37f1abe8c..52c4d2a7c9 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.3.1/git.html[documentation for release 2.3.1]
+* link:v2.3.2/git.html[documentation for release 2.3.2]
* release notes for
+ link:RelNotes/2.3.2.txt[2.3.2],
link:RelNotes/2.3.1.txt[2.3.1],
link:RelNotes/2.3.0.txt[2.3].
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 0407788976..50078659fc 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.3.1
+DEF_VER=v2.3.2
LF='
'