Git 2.2.0-rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt
index 826b0e420d3546b0f342407bd4e14d4b97e8ab3a..741e14e26d6c24ae465604397e198d434f0b5316 100644 (file)
--- 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 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.
  * "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.
 
    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.
 
 
 Performance, Internal Implementation, etc.
 

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 153d55d2b99e1340f92140eb231cd919d3af80c8..2b2d79799ffd4578e5e46de27eccdb46b9f475fa 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v2.1.0.GIT
+DEF_VER=v2.2.0-rc0

 
 LF='
 '
 
 LF='
 '