summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-26 11:30:08 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-26 12:59:36 -0700
commit4a9a4f0ec1daaccb88cdf507375ca64696dfe167 (patch)
treed7ad17522e32d2ecd11e698e83f82bbf4effbb7b
parent7a011aac0ef32e1b4835284c3ca6360729d7b83b (diff)
downloadgit-4a9a4f0ec1daaccb88cdf507375ca64696dfe167.tar.gz
Git 1.8.2.2v1.8.2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.8.2.2.txt18
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
3 files changed, 21 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.8.2.2.txt b/Documentation/RelNotes/1.8.2.2.txt
index 4f4c4df99b..dab4831ca0 100644
--- a/Documentation/RelNotes/1.8.2.2.txt
+++ b/Documentation/RelNotes/1.8.2.2.txt
@@ -4,6 +4,24 @@ Git v1.8.2.2 Release Notes
Fixes since v1.8.2.1
--------------------
+ * Zsh completion forgot that '%' character used to signal untracked
+ files needs to be escaped with another '%'.
+
+ * A commit object whose author or committer ident are malformed
+ crashed some code that trusted that a name, an email and an
+ timestamp can always be found in it.
+
+ * The new core.commentchar configuration was not applied to a few
+ places.
+
+ * "git pull --rebase" did not pass "-v/-q" options to underlying
+ "git rebase".
+
+ * When receive-pack detects error in the pack header it received in
+ order to decide which of unpack-objects or index-pack to run, it
+ returned without closing the error stream, which led to a hang
+ sideband thread.
+
* "git diff --diff-algorithm=algo" was understood by the command line
parser, but "git diff --diff-algorithm algo" was not.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 807a13c806..8438c076c3 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,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.8.2.1/git.html[documentation for release 1.8.2.1]
+* link:v1.8.2.2/git.html[documentation for release 1.8.2.2]
* release notes for
+ link:RelNotes/1.8.2.2.txt[1.8.2.2].
link:RelNotes/1.8.2.1.txt[1.8.2.1].
link:RelNotes/1.8.2.txt[1.8.2].
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 26422bfc22..7186e774a8 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.2.1
+DEF_VER=v1.8.2.2
LF='
'