summaryrefslogtreecommitdiff
path: root/all-update.sh
diff options
context:
space:
mode:
Diffstat (limited to 'all-update.sh')
-rwxr-xr-xall-update.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/all-update.sh b/all-update.sh
index 4122bc8..caeb39b 100755
--- a/all-update.sh
+++ b/all-update.sh
@@ -62,7 +62,7 @@ for repo in $repos; do
echo "startpoint is $startpoint, branchpoint is $branchpoint"
tag=`git describe --tags $(git rev-list --tags --max-count=1)`
echo "merging $tag in $repo"
- git checkout $branchpoint
+ git reset --hard $branchpoint
foo=`git merge --no-verify-signatures $tag 2>&1`
for commit in `git cherry origin/master $branch | sed 's/+ //`
do