Merge commit 'HEAD@{1}' into develop

This commit is contained in:
ZyX 2015-02-19 12:28:03 +03:00
commit 9375b3122a
1 changed files with 2 additions and 1 deletions

View File

@ -105,9 +105,10 @@ def merge(version_string, rev, **kwargs):
check_call(['git', 'tag', '-m', 'Release ' + version_string, '-a', version_string])
def push(version_string, **kwargs):
def push(version_string, rev, **kwargs):
check_call(['git', 'push', 'upstream', 'master'])
check_call(['git', 'push', 'upstream', version_string])
check_call(['git', 'push', 'upstream', rev])
def upload(**args):