grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update with -X only for merge (#3745)

Browse Source
This commit is contained in:
Jaco Greeff 2016-12-08 14:48:09 +01:00 committed by GitHub
parent de4715bc67
commit cbd5fe7c07
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/scripts/release.sh
View File

@ -35,9 +35,9 @@ git checkout -b $BRANCH
echo "*** Committing compiled files for $UTCDATE" echo "*** Committing compiled files for $UTCDATE"
mv build ../build.new mv build ../build.new
git pull origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]" git pull origin/$BRANCH --commit --no-edit -X ours
git rm build/* git rm build/*
git commit -m "$UTCDATE [rm]" git commit -m "$UTCDATE [rm old]"
mv -f ../build.new/* build/ mv -f ../build.new/* build/
rm -rf ../build.new rm -rf ../build.new
git add . git add .

1
js/scripts/test.js Normal file
View File

@ -0,0 +1 @@
// test script