From: Thierry Parmentelat Date: Thu, 25 Apr 2013 09:18:47 +0000 (+0200) Subject: oops X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4e0a9e9be4d29de53686031b956f1997ac02bfea;p=infrastructure.git oops --- diff --git a/scripts/git-update.sh b/scripts/git-update.sh index bd555e3..93b8ffd 100755 --- a/scripts/git-update.sh +++ b/scripts/git-update.sh @@ -34,6 +34,7 @@ function git_update () { git branch | grep -q ' '$branch'$' || git branch --track $branch $remote/$branch git checkout $branch git merge --ff $remote/$branch + done } git_update >& .git-update.log