From c93b54762414878fc44de3c735392439c3535102 Mon Sep 17 00:00:00 2001 From: nvbn Date: Thu, 7 Jul 2016 15:41:51 +0300 Subject: [PATCH] #529: Minor style changes --- thefuck/rules/git_push_pull.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/thefuck/rules/git_push_pull.py b/thefuck/rules/git_push_pull.py index d55b519..785e74f 100644 --- a/thefuck/rules/git_push_pull.py +++ b/thefuck/rules/git_push_pull.py @@ -5,10 +5,13 @@ from thefuck.specific.git import git_support @git_support def match(command): - return ('push' in command.script - and '! [rejected]' in command.stderr - and 'failed to push some refs to' in command.stderr - and (('Updates were rejected because the tip of your current branch is behind' in command.stderr) or 'Updates were rejected because the remote contains work that you do' in command.stderr)) + return ('push' in command.script and + '! [rejected]' in command.stderr and + 'failed to push some refs to' in command.stderr and + ('Updates were rejected because the tip of your' + ' current branch is behind' in command.stderr or + 'Updates were rejected because the remote ' + 'contains work that you do' in command.stderr)) @git_support