Git 2.42

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

diff --git a/Documentation/RelNotes/2.42.0.txt b/Documentation/RelNotes/2.42.0.txt
index 8ae2d7d5d02f2464b5c9fe26bbaf4162a60e3c66..0f1897ad5f52a49f7fa24127f67a30a00c6da7a3 100644 (file)
--- a/Documentation/RelNotes/2.42.0.txt
+++ b/Documentation/RelNotes/2.42.0.txt
@@ -14,7 +14,7 @@ UI, Workflows & Features
    otherwise unreachable objects in cruft packs.
 
  * Add more "git var" for toolsmiths to learn various locations Git is
-   configured with either via the configuration or hardcoded defaults.
+   configured with either via the configuration or hard-coded defaults.
 
  * 'git notes append' was taught '--separator' to specify string to insert
    between paragraphs.

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