<newsletter:master> Adding a brief information about branches inside the geany-newsletter repository

[Frank Lanitz]

Updating branch refs/heads/master
         to 1bc042a52420551afe654c42971b2ca28abd3dea (commit)
       from 45ff8d931fe76a6738711eaed5ef172a6e87f2e3 (commit)

commit 1bc042a52420551afe654c42971b2ca28abd3dea
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Sun Apr 3 18:40:38 2011 +0200

    Adding a brief information about branches inside the geany-newsletter repository

 README |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/README b/README
index abaf31e..8227d82 100644
--- a/README
+++ b/README
@@ -1,3 +1,19 @@
+Different branches of this repo
+===============================
+
+master:  Reflects the current development branch where e.g. new
+         newsletter versions are getting created in.
+
+website: Contains the content, which is currently published on the
+         webserver.
+
+In order to bring something 'live' you have to choices:
+
+1. Make usage of git cherry-pick <object> or
+2. Merge complete branch master into website branch via e.g.
+   git checkout website && git merge master
+
+
 Prerequisites
 =============