#295 Add git_push_pull rule

thefuck/rules/git_push_force.py

@@ -13,3 +13,6 @@ def match(command, settings):
 @utils.git_support
 def get_new_command(command, settings):
     return command.script.replace('push', 'push --force')
+
+
+enabled_by_default = False

thefuck/rules/git_push_pull.py

@@ -0,0 +1,17 @@
+from thefuck import utils
+from thefuck.shells import and_
+
+
+@utils.git_support
+def match(command, settings):
+    return ('git' in command.script
+            and '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)
+
+
+@utils.git_support
+def get_new_command(command, settings):
+    return and_(command.script.replace('push', 'pull'),
+                command.script)