mirror of https://github.com/CGAL/cgal
Implement the reseting of integration
This commit is contained in:
parent
8c374aa36f
commit
9207f428c8
|
|
@ -9,6 +9,11 @@ if [ -d "$1/.git" ]; then
|
||||||
echo "Git repository, in branch '$branch'"
|
echo "Git repository, in branch '$branch'"
|
||||||
git fetch
|
git fetch
|
||||||
git reset --hard origin/$branch
|
git reset --hard origin/$branch
|
||||||
|
git clean -f
|
||||||
|
|
||||||
|
# Hard-reset integration "every day" even if today's "$branch" is not integration
|
||||||
|
git push -f origin origin/master:integration
|
||||||
|
|
||||||
popd
|
popd
|
||||||
else
|
else
|
||||||
svn up "$1"
|
svn up "$1"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue