Merge branch 'master' of git://github.com/Asday/thefuck into Asday-master

This commit is contained in:
Vladimir Iakovlev
2017-03-22 13:57:18 +01:00
3 changed files with 43 additions and 0 deletions
+1
View File
@@ -188,6 +188,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
* `git_pull_uncommitted_changes` – stashes changes before pulling and pops them afterwards;
* `git_push` – adds `--set-upstream origin $branch` to previous failed `git push`;
* `git_push_pull` – runs `git pull` when `push` was rejected;
* `git_push_without_commits` – Creates an initial commit if you forget and only `git add .`, when setting up a new project;
* `git_rebase_no_changes` – runs `git rebase --skip` instead of `git rebase --continue` when there are no changes;
* `git_rm_local_modifications` – adds `-f` or `--cached` when you try to `rm` a locally modified file;
* `git_rm_recursive` – adds `-r` when you try to `rm` a directory;