Add git merge rule (#755)

This fixes https://github.com/nvbn/thefuck/issues/629
This commit is contained in:
David Hart
2018-01-02 16:47:48 +00:00
committed by Joseph Frazier
parent 897572d278
commit f700b23f57
3 changed files with 45 additions and 0 deletions
+1
View File
@@ -191,6 +191,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
* `git_fix_stash` – fixes `git stash` commands (misspelled subcommand and missing `save`);
* `git_flag_after_filename` – fixes `fatal: bad flag '...' after filename`
* `git_help_aliased` &ndash; fixes `git help <alias>` commands replacing <alias> with the aliased command;
* `git_merge` &ndash; adds remote to branch names;
* `git_not_command` &ndash; fixes wrong git commands like `git brnch`;
* `git_pull` &ndash; sets upstream before executing previous `git pull`;
* `git_pull_clone` &ndash; clones instead of pulling when the repo does not exist;