maintenance branch is 1.2.1-dev for now

This branch is for preparing the next patch-releases of the current
stable release on the master branch.
This commit is contained in:
Gina Häußge 2015-06-25 11:00:14 +02:00
parent cfa4cb2a7c
commit a0f2079fb5

View file

@ -7,12 +7,13 @@
# The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out,
# the lookup table does not apply to the matched branches
# master and staging shall not use the lookup table
# master shall not use the lookup table, only tags
master
staging
# fix/ branches are fixes for master, so we don't handle those either
fix/.*
# maintenance is currently the branch for preparation of maintenance release 1.2.1
# so are any fix/... branches
maintenance 1.2.1-dev cfa4cb2a7c5f1af10dc8
fix/.* 1.2.1-dev cfa4cb2a7c5f1af10dc8
# every other branch is a development branch and thus gets resolved to 1.2.0-dev for now
.* 1.2.0-dev 50cf776e70b9