Git 2.12

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

diff --git a/Documentation/RelNotes/2.12.0.txt b/Documentation/RelNotes/2.12.0.txt
index 93165bd2c33e4bf9b25feceadd64f9c363c5e686..29154805b4e56010955d961726cfda4c8325eca2 100644 (file)
--- a/Documentation/RelNotes/2.12.0.txt
+++ b/Documentation/RelNotes/2.12.0.txt
@@ -492,3 +492,9 @@ notes for details).
    (merge e91461b332 jk/doc-submodule-markup-fix later to maint).
    (merge 8ab9740d9f dp/submodule-doc-markup-fix later to maint).
    (merge 0838cbc22f jk/tempfile-ferror-fclose-confusion later to maint).
+   (merge 115a40add6 dr/doc-check-ref-format-normalize later to maint).
+   (merge 133f0a299d gp/document-dotfiles-in-templates-are-not-copied later to maint).
+   (merge 2b35a9f4c7 bc/blame-doc-fix later to maint).
+   (merge 7e82388024 ps/doc-gc-aggressive-depth-update later to maint).
+   (merge 9993a7c5f1 bc/worktree-doc-fix-detached later to maint).
+   (merge e519eccdf4 rt/align-add-i-help-text later to maint).

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 4f208fab925cc00535c23c40d38ad6e3d56eeaab..aa895da4a5fbc5e83c87bfa98683157d3d43fa0e 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,6 +44,11 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
+* link:v2.12.0/git.html[documentation for release 2.12.0]
+
+* release notes for
+  link:RelNotes/2.12.0.txt[2.12].
+
 * link:v2.11.1/git.html[documentation for release 2.11.1]
 
 * release notes for

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