Inceptions: adds fetch and merge actions

diff --git a/inception b/inception
index b4beaf8b6c262e3491a8489755d65ea9b709a5cb..3e7cb0ae0fdaa6987d1faa8fb07259b22ab38d44 100755 (executable)
--- 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