notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fpull: Use rebase

Browse Source
This commit is contained in:
nyuszika7h 2014-11-26 14:18:22 +01:00
parent adca55fce5
commit d9b89a5f95
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/wolfgame.py
View File

@ -5886,7 +5886,7 @@ def player_stats_pm(cli, nick, rest):
@cmd('fpull', admin_only=True) @cmd('fpull', admin_only=True)
def fpull(cli, nick, chan, rest): def fpull(cli, nick, chan, rest):
"""Pulls from the repository to update the bot.""" """Pulls from the repository to update the bot."""
args = ['git', 'pull'] args = ['git', 'pull', '--rebase=preserve']
if rest: if rest:
args += rest.split(' ') args += rest.split(' ')