]> gitweb.fluxo.info Git - inception.git/commitdiff
Adds pull action master
authorSilvio Rhatto <rhatto@riseup.net>
Sun, 16 Aug 2020 02:47:07 +0000 (23:47 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sun, 16 Aug 2020 02:47:07 +0000 (23:47 -0300)
infection

index f8795b3ce50bf1304cfd1d729b40c02379ea930d..97e4ff522c9ea6448c85e52e59d1b665d285c4ff 100755 (executable)
--- 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