diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-24 10:49:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-24 10:49:58 -0800 |
| commit | e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7 (patch) | |
| tree | 426097b4cfbdac84ab83608a0729a405161be922 | |
| parent | cca4f20edad04decdc268102f9a6ee2e3803bcc7 (diff) | |
| download | git-e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7.tar.gz | |
Git 2.12v2.12.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/2.12.0.txt | 6 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.12.0.txt b/Documentation/RelNotes/2.12.0.txt index 93165bd2c3..29154805b4 100644 --- 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 4f208fab92..aa895da4a5 100644 --- 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 be07d623b3..6a208e92bf 100755 --- 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=' ' |