From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 16 Aug 2020 02:47:07 +0000 (-0300)
Subject: Adds pull action
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=0c0a79810d760e3e6b9b31f98eb8f39f784f5bdf;p=inception.git

Adds pull action
---

diff --git a/infection b/infection
index f8795b3..97e4ff5 100755
--- a/infection
+++ b/infection
@@ -218,6 +218,8 @@ elif [ "$ACTION" == "fetch" ]; then
   infection_fetch
 elif [ "$ACTION" == "merge" ]; then
   infection_merge
+elif [ "$ACTION" == "pull" ]; then
+  infection fetch && infection_merge
 elif [ "$ACTION" == "status" ]; then
   infection_status
 elif [ "$ACTION" != "init" ]; then