#N/A: Add git_rebase_merge_dir rule

This commit is contained in:
Pablo Santiago Blum de Aguiar
2016-10-30 20:07:14 -02:00
parent cb99e42e02
commit 07005b591a
3 changed files with 58 additions and 0 deletions
+1
View File
@@ -183,6 +183,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
* `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;
* `git_rebase_merge_dir` – offers `git rebase (--continue | --abort | --skip)` or removing the `.git/rebase-merge` dir when a rebase is in progress;
* `git_remote_seturl_add` – runs `git remote add` when `git remote set_url` on nonexistant remote;
* `git_stash` – stashes you local modifications before rebasing or switching branch;
* `git_two_dashes` – adds a missing dash to commands like `git commit -amend` or `git rebase -continue`;