From 7ce5c4307ac5ae57318c2631b6c0f15aebeab735 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Wed, 18 Nov 2015 20:41:41 -0800
Subject: [PATCH] remove travis git scripts - Fixes T6661

---
 .travis.yml                                     |  3 ---
 scripts/travis/merge-development-with-master.sh | 14 --------------
 scripts/travis/setup-git.sh                     |  5 -----
 3 files changed, 22 deletions(-)
 delete mode 100755 scripts/travis/merge-development-with-master.sh
 delete mode 100755 scripts/travis/setup-git.sh

diff --git a/.travis.yml b/.travis.yml
index 87f3ff7ffd..4ecf15d1d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,6 @@ node_js:
  - "0.12"
 
 script: make test-ci
-after_success:
- - ./scripts/travis/setup-git.sh
- - ./scripts/travis/merge-development-with-master.sh
 
 notifications:
   slack: babeljs:5Wy4QX13KVkGy9CnU0rmvgeK
diff --git a/scripts/travis/merge-development-with-master.sh b/scripts/travis/merge-development-with-master.sh
deleted file mode 100755
index dafc503b66..0000000000
--- a/scripts/travis/merge-development-with-master.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -e
-
-echo "Branch: $TRAVIS_BRANCH"
-echo "Commit: $TRAVIS_COMMIT"
-
-if [ "$TRAVIS_BRANCH" != "development" ]; then
-  exit 0;
-fi
-
-git fetch origin master:master
-git checkout master
-git merge "$TRAVIS_COMMIT"
-git push "https://${GH_TOKEN}@github.com/babel/babel"
diff --git a/scripts/travis/setup-git.sh b/scripts/travis/setup-git.sh
deleted file mode 100755
index 82171bdf78..0000000000
--- a/scripts/travis/setup-git.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-
-git config user.name "sebmckbot"
-git config user.email "sebmckbbot@gmail.com"