summaryrefslogtreecommitdiff
path: root/branches
diff options
context:
space:
mode:
authoromega <omega@omg.(none)>2009-02-26 09:42:25 +0100
committeromega <omega@omg.(none)>2009-02-26 09:42:25 +0100
commit0d3f2934c5d01fc7706f7d6f0434f1ecaefb2980 (patch)
treeb8ab878b085cd6511853be74ffa5c87aa6c97a31 /branches
parent4c2a216730a67ea22ad4016eba96a4dfcce223a6 (diff)
downloadscripts-0d3f2934c5d01fc7706f7d6f0434f1ecaefb2980.tar.gz
scripts-0d3f2934c5d01fc7706f7d6f0434f1ecaefb2980.tar.bz2
Improved branching (patch written by some-guy)
Diffstat (limited to 'branches')
-rw-r--r--branches/compiz++9
-rw-r--r--branches/compiz-0.610
-rw-r--r--branches/compiz-0.818
3 files changed, 37 insertions, 0 deletions
diff --git a/branches/compiz++ b/branches/compiz++
new file mode 100644
index 0000000..a68eeb5
--- /dev/null
+++ b/branches/compiz++
@@ -0,0 +1,9 @@
+## COMPIZ++ CONFIG FILE FOR GIT-COMPIZ
+CORE="HEAD"
+FUSION="compiz++"
+
+if ( echo $CURRENT_ITEM | grep -e compiz -e core &>/dev/null); then
+ GIT_BRANCH=origin/$CORE
+else
+ GIT_BRANCH=origin/$FUSION
+fi
diff --git a/branches/compiz-0.6 b/branches/compiz-0.6
new file mode 100644
index 0000000..52ab2ac
--- /dev/null
+++ b/branches/compiz-0.6
@@ -0,0 +1,10 @@
+## COMPIZ 0.6 CONFIG FILE FOR GIT-COMPIZ
+
+CORE="compiz-0.6"
+FUSION="0.6"
+
+if ( echo $CURRENT_ITEM | grep -e compiz -e core &>/dev/null); then
+ GIT_BRANCH=origin/$CORE
+else
+ GIT_BRANCH=origin/$FUSION
+fi
diff --git a/branches/compiz-0.8 b/branches/compiz-0.8
new file mode 100644
index 0000000..542d1fe
--- /dev/null
+++ b/branches/compiz-0.8
@@ -0,0 +1,18 @@
+## COMPIZ 0.8 CONFIG FILE FOR GIT-COMPIZ
+# Uses standard bash syntax
+# This is a highly documented example to be compied for making new branches
+
+# Best to define all branches at the top
+CORE="compiz-0.8"
+FUSION="0.8"
+
+# Here we have our statements
+# CURRENT_ITEM is a variable provided by git-compiz to show what we are
+# handling
+# In this situation, check if we are on core, if we are, the branch is
+# compiz-0.8, otherwise it is 0.8
+if ( echo $CURRENT_ITEM | grep -e compiz -e core &>/dev/null); then
+ GIT_BRANCH=origin/$CORE
+else
+ GIT_BRANCH=origin/$FUSION
+fi