summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/README.md b/README.md
index 2cc4c72..3c711ab 100644
--- a/README.md
+++ b/README.md
@@ -18,3 +18,10 @@ Dynamic menu library and client program inspired by dmenu
* **Build system** - [CMake](http://www.cmake.org/)
* **API documentation** - [Doxygen](http://www.stack.nl/~dimitri/doxygen/index.html)
(JavaDoc style comments)
+* **Branches**
+ * **master** - stable releases (permanent)
+ * **develop** - development (permanent), merge back to **master**
+ * **dev/topic** - topic related development (temporary), branch off from
+ **develop** and merge to **develop**
+ * **hotfix/issue** - stable release bugfixes (temporary), branch off from
+ **master** and merge to **master** and **develop**