aboutsummaryrefslogtreecommitdiff
path: root/updown
diff options
context:
space:
mode:
Diffstat (limited to 'updown')
-rwxr-xr-xupdown7
1 files changed, 6 insertions, 1 deletions
diff --git a/updown b/updown
index 732c9d1..6b27024 100755
--- a/updown
+++ b/updown
@@ -3,7 +3,12 @@
# commit, merge, push and fetch
#
-commit $*
+if [ ! -z "$*" ]; then
+ commit $*
+else
+ updates
+fi
+
git merge-to master
if [ "`git branch | grep '^*'`" == '* develop' ]; then