aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-06-02 22:49:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-06-02 22:49:33 -0300
commitdc7e45b1fa836f943440aa6a6b91ec9765ba25e3 (patch)
tree7b127933e71cb7703fb34b7a8529ee5604b746d8
parentc3ad995c1ecf910e3a657293f9c8d4a614059f4f (diff)
downloadutils-git-dc7e45b1fa836f943440aa6a6b91ec9765ba25e3.tar.gz
utils-git-dc7e45b1fa836f943440aa6a6b91ec9765ba25e3.tar.bz2
Enhance commit strategy at 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