Sorting the difference from fetch and pull (voxpupuli#174).

locp · Feb 20, 2016 · df94603 · df94603
1 parent b6f9f66
commit df94603
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/scripts/circle.bash b/scripts/circle.bash
@@ -27,8 +27,10 @@ merge () {
   fi
 
   set -x
-  echo "Pulling $target from the origin."
-  git pull -p || exit $?
+  echo "Fetching from origin with purge."
+  git fetch -p origin || exit $?
+  echo "Pulling from origin."
+  git pull || exit $?
   echo "Merging $CIRCLE_BRANCH into $target."
   git merge $CIRCLE_BRANCH || exit $?
   echo "Pushing merged branch back to the origin."