From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 22 Feb 2017 23:42:03 +0000 (-0300)
Subject: Inceptions: adds fetch and merge actions
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=08f4a2f517a31742d4085eca6f59ec0054036593;p=rhatto%2Fapps.git

Inceptions: adds fetch and merge actions
---

diff --git a/inception b/inception
index b4beaf8..3e7cb0a 100755
--- a/inception
+++ b/inception
@@ -80,4 +80,8 @@ EOF
   fi
 elif [ "$1" == "version" ]; then
   ( cd $DIRNAME && git log -n 1 )
+elif [ "$1" == "fetch" ]; then
+  ( cd $DIRNAME && git fetch --all && git log -n 1 --branches=origin/master )
+elif [ "$1" == "merge" ]; then
+  ( cd $DIRNAME && git merge origin/master )
 fi