Added rule that stashes changed files before pulling and pops them afterwards.
This commit is contained in:
@@ -103,7 +103,7 @@ brew install thefuck
|
||||
```
|
||||
|
||||
On Ubuntu you can install `The Fuck` with:
|
||||
|
||||
|
||||
```bash
|
||||
sudo apt update
|
||||
sudo apt install python3-dev python3-pip
|
||||
@@ -174,6 +174,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
|
||||
* `git_not_command` – fixes wrong git commands like `git brnch`;
|
||||
* `git_pull` – sets upstream before executing previous `git pull`;
|
||||
* `git_pull_clone` – clones instead of pulling when the repo does not exist;
|
||||
* `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_rebase_no_changes` – runs `git rebase --skip` instead of `git rebase --continue` when there are no changes;
|
||||
|
||||
Reference in New Issue
Block a user