From e51b91ab4772d1a9a48da93908c3c8f41986f178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrb=C3=A1=C4=8D?= <david@hrbac.cz>
Date: Thu, 12 Jan 2017 17:08:44 +0100
Subject: [PATCH] modified colors.sh script

---
 colors.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/colors.sh b/colors.sh
index b4f9aacd4..b911dc972 100644
--- a/colors.sh
+++ b/colors.sh
@@ -1,11 +1,11 @@
 for i in {"red","pink","purple","deep purple","indigo","blue","light blue","cyan","teal","green","light green","lime","yellow","amber","orange","deep orange","brown","grey","blue grey"}
 do
   echo "Setting color to: $i, ${i/ /_}, color_${i/ /_}"
-  git checkout -b color_${i/ /_}
-  #git checkout color_${i/ /_}
+  #git checkout -b color_${i/ /_}
+  git checkout color_${i/ /_}
   #rm -fr "/home/hrb33/Dokumenty/dev/it4i/docs.it4i.git/.git/rebase-apply"
-  #git pull --rebase origin colors
-  #git pull --rebase 
+  git pull --rebase origin colors
+  git pull --rebase 
   sed -ri "s/(primary: ').*'/\1$i'/" mkdocs.yml
   #git cherry-pick bd8e358 
   git commit -am "Setting color to: $i"
-- 
GitLab