towards cta

Readme.md

@@ -9,8 +9,13 @@ https://docs.google.com/document/d/1yEmV_DbRBKQKVCoovjXriNgSjNEBaz50WA0l3yA5jtg/
 * push local stuff to git *
 ***************************
 zamofing_t@ganymede:
-cd ~/Documents/prj/SwissFEL/epics_ioc_modules/ESB_MX && git commit-amend && git push psigithub
-cd ~/Documents/prj/SwissFEL/epics_ioc_modules/ESB_MX/python/SwissMX && git commit-amend && git push psigithub
+cd ~/Documents/prj/SwissFEL/epics_ioc_modules/ESB_MX &&\
+git commit-amend &&\
+git push psigithub
+
+cd ~/Documents/prj/SwissFEL/epics_ioc_modules/ESB_MX/python/SwissMX &&\
+git commit-amend &&\
+git push psigithub
 
 *************************************
 * switch to latest test environment *
@@ -23,20 +28,21 @@ ssh zamofing_t@saresc-cons-03
   #cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX/python/SwissMX
   #git remote add psigithub git@git.psi.ch:zamofing_t/SwissMX.git
 
-cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX/python/SwissMX
-git checkout master
-git stash push
-#git pull psigithub --ff-only master
-git reset psigithub/master --hard
+cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX/python/SwissMX &&\
+git checkout master &&\
+git stash push &&\
+git fetch psigithub master &&\
+git reset psigithub/master --hard &&\
 git stash pop
+#git pull psigithub --ff-only master
 
-cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX
-git checkout master
-git stash push
+cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX &&\
+git checkout master &&\
+git stash push &&\
+git fetch psigithub master &&\
+git reset psigithub/master --hard &&\
+git stash pop && chmod -R g+w *
 #git pull psigithub --ff-only master
-git reset psigithub/master --hard
-git stash pop
-chmod -R g+w *
 
 *******************
 * run application *