From 00965a4ccd41dddb58e100e654f1d24277a60c7f Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Sun, 15 May 2016 17:53:52 -0500
Subject: [PATCH] Copy over git rebase in travis from -extras

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4886a6c3dc1..c544cbecb44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,10 @@ addons:
       - python2.4
       - python2.6
       - python3.5
+before_install:
+  - git config user.name "ansible"
+  - git config user.email "ansible@ansible.com"
+  - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then git rebase $TRAVIS_BRANCH; fi;
 install:
   - pip install git+https://github.com/ansible/ansible.git@devel#egg=ansible
   - pip install git+https://github.com/sivel/ansible-testing.git#egg=ansible_testing