diff options
author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2013-12-09 22:37:03 +0000 |
---|---|---|
committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2013-12-09 22:37:03 +0000 |
commit | 3d21d585636c5c51c4d34590f2e4a61d4f23af3b (patch) | |
tree | 039cece8e0603ac630a1ae7dc04d1ece34b57fa6 | |
parent | 3d3dd029f83c5aa39e870bedbc7990a23267678b (diff) | |
download | morphs-3d21d585636c5c51c4d34590f2e4a61d4f23af3b.tar.gz |
force reset rather than checkout branchpoint
-rwxr-xr-x | all-update.sh | 2 |
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 |