From e0b5a83e9f6ac2aedee4661b37877c57c5246015 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 28 Aug 2015 14:05:25 -0700 Subject: [PATCH] Meta/MaintNotes: 2.5.1 --- MaintNotes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MaintNotes b/MaintNotes index 120e759932..e8cdfffcf4 100644 --- a/MaintNotes +++ b/MaintNotes @@ -131,7 +131,7 @@ named with three dotted decimal digits (e.g. "1.8.5"), but recently we switched the versioning scheme and "feature releases" are named with three-dotted decimal digits that ends with ".0" (e.g. "1.9.0"). -The last such release was 2.4.0 done on Apr 30th, 2015. You can expect +The last such release was 2.5.0 done on Jul 27th, 2015. You can expect that the tip of the "master" branch is always more stable than any of the released versions. @@ -142,8 +142,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.3.4" is the -fourth maintenance release for the "2.3" series). +the last digit of three-dotted decimal name (e.g. "2.5.1" is the +fourth maintenance release for the "2.5" 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