[Truffle] Add tool to keep some files on each branch separate.

jruby · Sep 27, 2016 · 39c79f3 · 39c79f3
1 parent 7789b7c
commit 39c79f3
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/tool/truffle/merge.sh b/tool/truffle/merge.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+git merge --no-commit origin/master
+
+# git reset appveyor.yml
+git rm -f appveyor.yml
+
+for f in .travis.yml ci.hocon; do
+	git reset $f
+	git checkout $f
+done