summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-05 19:31:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-05 19:31:47 (GMT)
commit8d7a455ed52e2a96debc080dfc011b6bb00db5d2 (patch)
treee9f120ca31da5e3a96fca5163909e0cb07a77b46
parenta274e0a036ea886a31f8b216564ab1b4a3142f6c (diff)
downloadgit-8d7a455ed52e2a96debc080dfc011b6bb00db5d2.zip
git-8d7a455ed52e2a96debc080dfc011b6bb00db5d2.tar.gz
git-8d7a455ed52e2a96debc080dfc011b6bb00db5d2.tar.bz2
Start post 2.11 cycle
For now, let's call it 2.12 tentatively. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.12.0.txt43
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 45 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.12.0.txt b/Documentation/RelNotes/2.12.0.txt
new file mode 100644
index 0000000..08152d6
--- /dev/null
+++ b/Documentation/RelNotes/2.12.0.txt
@@ -0,0 +1,43 @@
+Git 2.12 Release Notes
+======================
+
+Backward compatibility notes.
+
+ * Use of an empty string that is used for 'everything matches' is
+ still warned and Git asks users to use a more explicit '.' for that
+ instead. The hope is that existing users will not mind this
+ change, and eventually the warning can be turned into a hard error,
+ upgrading the deprecation into removal of this (mis)feature. That
+ is not scheduled to happen in the upcoming release (yet).
+
+ * The historical argument order "git merge <msg> HEAD <commit>..."
+ has been deprecated for quite some time, and will be removed in the
+ upcoming release.
+
+
+Updates since v2.11
+-------------------
+
+UI, Workflows & Features
+
+ *
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ *
+
+
+Also contains various documentation updates and code clean-ups.
+
+ *
+
+
+Fixes since v2.10
+-----------------
+
+Unless otherwise noted, all the fixes since v2.9 in the maintenance
+track are contained in this release (see the maintenance releases'
+notes for details).
+
+ * Other minor doc, test and build updates and code cleanups.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 520d6e6..556fbfc 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.11.0
+DEF_VER=v2.11.GIT
LF='
'
diff --git a/RelNotes b/RelNotes
index b54330f..d09c3d5 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.11.0.txt \ No newline at end of file
+Documentation/RelNotes/2.12.0.txt \ No newline at end of file