aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xinception4
1 files changed, 4 insertions, 0 deletions
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