From e0ab1fb4aa67ad511defe65bfd5aab01d0521535 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 6 Mar 2015 15:23:57 -0800 Subject: [PATCH] MaintNotes: post 2.3.1 Also mention conservancy and git-security. --- MaintNotes | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/MaintNotes b/MaintNotes index eb72a18ddc..9cfb00bb08 100644 --- a/MaintNotes +++ b/MaintNotes @@ -52,6 +52,11 @@ available at: http://colabti.org/irclogger/irclogger_log/git http://colabti.org/irclogger/irclogger_log/git-devel +Git is a member project of software freedom conservancy, a non-profit +organization (https://sfconservancy.org/). To reach a committee of +liaisons to the conservancy, contact them at . + + * Reporting bugs When you think git does not behave as you expect, please do not stop @@ -78,6 +83,11 @@ Please remember to always state See http://www.chiark.greenend.org.uk/~sgtatham/bugs.html for further hints. +If you think you found a security-sensitive issue and want to disclose +it to us without announcing it to wider public, please contact us at +our security mailing list . + + * Repositories, branches and documentation. My public git.git repositories are at: @@ -129,8 +139,8 @@ are cut from it. The maintenance releases used to be named with four dotted decimal, named after the feature release they are updates to (e.g. "1.8.5.1" was the first maintenance release for "1.8.5" feature release). These days, maintenance releases are named by incrementing -the last digit of three-dotted decimal name (e.g. "2.2.1" will be the -first maintenance relaese for "2.2" series). +the last digit of three-dotted decimal name (e.g. "2.3.2" is the +second maintenance relaese for "2.3" series). New features never go to the 'maint' branch. This branch is also merged into "master" to propagate the fixes forward as needed. -- 2.11.4.GIT