Git 2.33

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

diff --git a/Documentation/RelNotes/2.33.0.txt b/Documentation/RelNotes/2.33.0.txt
index afa266380957189557bb21f16e0d79277ac85db0..893c18bfdd43d14ac0baa2797ac1e623cfba57a7 100644 (file)
--- a/Documentation/RelNotes/2.33.0.txt
+++ b/Documentation/RelNotes/2.33.0.txt
@@ -12,10 +12,6 @@ UI, Workflows & Features
    "smtp-server" that is meant to name the server to instead name the
    command to talk to the server.
 
- * The "-m" option in "git log -m" that does not specify which format,
-   if any, of diff is desired did not have any visible effect; it now
-   implies some form of diff (by default "--patch") is produced.
-
  * The userdiff pattern for C# learned the token "record".
 
  * "git rev-list" learns to omit the "commit <object-name>" header

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 98be1eb26166b19fb3a36f99a47c3203fc8cc4e1..b1c0d4eb2e683d5f085784d65906ef1cce9734eb 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.33.0-rc2
+DEF_VER=v2.33.0
 
 LF='
 '