summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-31 18:57:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-31 18:57:23 (GMT)
commit4ace7ff4557350b7e0b57d024a2ea311b332e01d (patch)
tree218b64fe05fbdbbf576e59cb6077bee96c7e771b
parentef59f324b0a61ce8a74fd6d1e10773739e335280 (diff)
downloadgit-2.2.0-rc0.zip
git-2.2.0-rc0.tar.gz
git-2.2.0-rc0.tar.bz2
Git 2.2.0-rc0v2.2.0-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.2.0.txt6
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt
index 826b0e4..741e14e 100644
--- a/Documentation/RelNotes/2.2.0.txt
+++ b/Documentation/RelNotes/2.2.0.txt
@@ -39,6 +39,9 @@ UI, Workflows & Features
* "git difftool" learned an option to stop feeding paths to the
diff backend when it exits with a non-zero status.
+ * "git grep" allows to paint (or not paint) partial matches on
+ context lines whenshowing "grep -C<num>" output in color.
+
* "log --date=iso" uses a slight variant of ISO 8601 format that is
made more human readable. A new "--date=iso-strict" option gives
datetime output that is more strictly conformant.
@@ -89,6 +92,9 @@ UI, Workflows & Features
document, whose contents have been updated to more modern Git
practice.
+ * On the "git svn" front, work to reduce memory consumption and
+ to improve handling of mergeinfo progresses.
+
Performance, Internal Implementation, etc.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 153d55d..2b2d797 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.1.0.GIT
+DEF_VER=v2.2.0-rc0
LF='
'