Skip to content

Commit

Permalink
Push to origin/deploy after Rapid Reload
Browse files Browse the repository at this point in the history
  • Loading branch information
𝐢𝐁𝐮𝐠 ♦ committed Sep 27, 2018
1 parent fdbe71e commit e9048e6
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion gitmanager.py
Expand Up @@ -275,7 +275,11 @@ def current_git_status():
if 'windows' in platform.platform().lower():
return git.status_stripped()
else:
return git.status()
return str(git.status())

@staticmethod
def current_branch():
return str(git('rev-parse', '--abbrev-ref', 'HEAD')).strip()

@staticmethod
def merge_abort():
Expand Down Expand Up @@ -316,5 +320,6 @@ def pull_local():
return
try:
git.merge("--ff-only", "master")
git.push("origin", "deploy")
except GitError:
return

0 comments on commit e9048e6

Please sign in to comment.