def main(args):
branch = get_current_branch_name()
if args.action == 'pull':
merge_with_base(branch,
rebase=args.rebase,
remote_branch=args.base,
remote=args.remote)
else:
sync_to_remote(branch,
remote=args.remote,
remote_branch=args.base,
force=args.force)
def submit_new_pullreq(remote='upstream', remote_branch=None, no_merge=False):
branch = get_current_branch_name()
if branch == 'master':
print_log('Pull request should never be from master')
return 1
if not no_merge:
rebase = not branch_is_published_already(branch)
merge_with_base(branch, rebase=rebase, remote=remote,
remote_branch=remote_branch)
push_to_my_fork(branch)
send_pullreq(branch, remote=remote, remote_branch=remote_branch)
def submit_new_pullreq(remote='upstream', remote_branch=None, no_merge=False):
branch = get_current_branch_name()
if branch == 'master':
print_log('Pull request should never be from master')
return 1
if not no_merge:
rebase = not branch_is_published_already(branch)
merge_with_base(branch,
rebase=rebase,
remote=remote,
remote_branch=remote_branch)
push_to_my_fork(branch)
send_pullreq(branch, remote=remote, remote_branch=remote_branch)
def main(args):
branch = get_current_branch_name()
merge_with_base(branch, rebase=args.rebase)