Merge pull request #187 from mcarton/git-stash

Add a git_stash rule

README.md

@@ -151,6 +151,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `git_checkout` – creates the branch before checking-out;
 * `git_no_command` – fixes wrong git commands like `git brnch`;
 * `git_push` – adds `--set-upstream origin $branch` to previous failed `git push`;
+* `git_stash` – stashes you local modifications before rebase;
 * `has_exists_script` – prepends `./` when script/binary exists;
 * `lein_not_task` – fixes wrong `lein` tasks like `lein rpl`;
 * `mkdir_p` – adds `-p` when you trying to create directory without parent;

thefuck/rules/git_stash.py

@@ -0,0 +1,7 @@
+def match(command, settings):
+    return ('git' in command.script
+            and 'Please commit or stash them.' in command.stderr)
+
+
+def get_new_command(command, settings):
+    return 'git stash && ' + command.script