Merge 31056fc27d into 62e0767c50

.gitignore

@@ -22,6 +22,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+venv/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

README.md

@@ -348,6 +348,7 @@ following rules are enabled by default:
 * `yarn_command_not_found` – fixes misspelled `yarn` commands;
 * `yarn_command_replaced` – fixes replaced `yarn` commands;
 * `yarn_help` – makes it easier to open `yarn` documentation;
+* `git_merge_mistake` – fixes slash mistake in git merge;
 
 ##### [Back to Contents](#contents)
 

thefuck/rules/git-checkout-master-no-git

@@ -0,0 +1,11 @@
+def match(command):
+
+    return (
+        command.script == "checkout master"
+    )
+
+
+
+
+def get_new_command(command):
+    return (command.script.replace("checkout master","git checkout master",1))

thefuck/rules/git-status-no-git.py

@@ -0,0 +1,11 @@
+def match(command):
+
+    return (
+        command.script == "status"
+    )
+
+
+
+
+def get_new_command(command):
+    return (command.script.replace("status","git status",1))

thefuck/rules/git_add_-a_-A.py

@@ -0,0 +1,6 @@
+def match(command):
+    return command.script == 'git add -a'
+
+
+def get_new_command(command):
+    return 'git add -A'

thefuck/rules/git_add_forgot_git.py

@@ -0,0 +1,6 @@
+def match(command):
+    return command.script == 'add'
+
+
+def get_new_command(command):
+    return 'git add -A'

thefuck/rules/git_init_no_git.py

@@ -0,0 +1,11 @@
+def match(command):
+
+    return (
+        command.script == "init"
+    )
+
+
+
+
+def get_new_command(command):
+    return (command.script.replace("init","git init",1))

thefuck/rules/git_merge_originmain_mistake.py

@@ -0,0 +1,8 @@
+def match(command):
+    return (
+        command.script == 'git merge originmain'
+    )
+
+
+def get_new_command(command):
+    return command.script.replace('originmain', 'origin/main', 1)

thefuck/rules/git_push_origin_slash_main_mistake.py

@@ -0,0 +1,8 @@
+def match(command):    
+    return (
+        command.script == "git push origin/main"
+    )
+
+
+def get_new_command(command):
+    return command.script.replace("origin/main", "origin main", 1)