diff --git a/.travis/push.sh b/.travis/push.sh
index 5005c96e1..0d5e2fe1b 100644
--- a/.travis/push.sh
+++ b/.travis/push.sh
@@ -1,18 +1,32 @@
-#!/bin/sh
-
 setup_git() {
   git config --global user.email "mst10041967@gmail.com"
   git config --global user.name "Rohit Tanwar"
 }
 
 commit_website_files() {
-  git add -A
-  git commit --message "Travis build: $TRAVIS_BUILD_NUMBER"
+  if [ $TRAVIS_EVENT_TYPE != "pull_request" ]; then
+    if [ $TRAVIS_BRANCH == "master" ]; then
+      echo "Committing to master branch..."
+      git checkout master
+      git add *
+      if [ $TRAVIS_EVENT_TYPE == "cron" ]; then
+        git commit --message "Travis build: $TRAVIS_BUILD_NUMBER [cron]"
+      elif [ $TRAVIS_EVENT_TYPE == "api" ]; then
+        git commit --message "Travis build: $TRAVIS_BUILD_NUMBER [custom]"
+      else
+        git commit --message "Travis build: $TRAVIS_BUILD_NUMBER"
+      fi
+    fi
+  fi
 }
 
 upload_files() {
-  git remote add origin https://${GH_TOKEN}@github.com/kriadmin/30-seconds-of-python-code.git
-  git push --quiet --set-upstream origin master
+  if [ $TRAVIS_EVENT_TYPE != "pull_request" ]; then
+    if [ $TRAVIS_BRANCH == "master" ]; then
+      echo "Pushing to master branch..."
+      git push --force --quiet "https://${GH_TOKEN}@github.com/kriadmin/30-seconds-of-python-code.git" master > /dev/null 2>&1
+    fi
+  fi
 }
 
 setup_git