X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_host;h=b99086b85fffb2b2fbf798b42b0be95efee55a01;hp=dfbaa517fa2230e222db17d5c5ce30b4eaf525ad;hb=6dd8add65ae14c272df64a12f00a142314c0b2b1;hpb=fe76c838090f262ec477c6a73d1bf9d988033b56 diff --git a/vm_host b/vm_host index dfbaa51..b99086b 100755 --- a/vm_host +++ b/vm_host @@ -35,10 +35,10 @@ rule_git_config () { rule_git_reset () { ( cd "$tool" - #git checkout -f -B master origin + #git checkout -f -B master remotes/master # NOTE: pas de -B sous squeeze git checkout HEAD'^' && - git branch -f master origin && + git branch -f master remotes/master && git checkout master git clean -f -d -x )