From 65c624ad52ff577cd0b78b34b64130c91c39589f Mon Sep 17 00:00:00 2001 From: mcarton Date: Wed, 13 May 2015 09:47:31 +0200 Subject: [PATCH] Improve the git_stash rule --- thefuck/rules/git_stash.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/thefuck/rules/git_stash.py b/thefuck/rules/git_stash.py index a95d8f4..58bfbb3 100644 --- a/thefuck/rules/git_stash.py +++ b/thefuck/rules/git_stash.py @@ -1,6 +1,7 @@ def match(command, settings): - return ('git' in command.script - and 'Please commit or stash them.' in command.stderr) + # catches "Please commit or stash them" and "Please, commit your changes or + # stash them before you can switch branches." + return 'git' in command.script and 'or stash them' in command.stderr def get_new_command(command, settings):