tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-26 23:35:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'HEAD@{1}' into develop

Browse Source
This commit is contained in:
ZyX 2015-02-19 02:56:15 +03:00
commit 58876504bc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/powerline-release.py
View File

@ -86,7 +86,8 @@ def merge(version_string, rev, **kwargs):
'--strategy', 'recursive', '--strategy', 'recursive',
'--strategy-option', 'theirs', '--strategy-option', 'theirs',
'--commit', '--commit',
'-m', 'Merge branch \'{0}\' into {1}'.format(temp_branch_name, rev)]) '-m', 'Merge branch \'{0}\' into {1}'.format(temp_branch_name, rev),
temp_branch_name])
check_call(['git', 'branch', '-d', temp_branch_name]) check_call(['git', 'branch', '-d', temp_branch_name])
rev = check_output(['git', 'rev-parse', 'HEAD']).strip() rev = check_output(['git', 'rev-parse', 'HEAD']).strip()