#1282 git misspelled
diff --git a/tests/rules/test_no_command.py b/tests/rules/test_no_command.py
index 0df4590b2..96f0f069a 100644
--- a/tests/rules/test_no_command.py
+++ b/tests/rules/test_no_command.py
@@ -21,7 +21,8 @@ def history_without_current(mocker):
     ('vom file.py', 'vom: not found'),
     ('fucck', 'fucck: not found'),
     ('puthon', "'puthon' is not recognized as an internal or external command"),
-    ('got commit', 'got: command not found')])
+    ('got commit', 'got: command not found'),
+    ('gti commit -m "new commit"', 'gti: command not found')])
 def test_match(mocker, script, output):
     mocker.patch('thefuck.rules.no_command.which', return_value=None)
 
@@ -43,6 +44,7 @@ def test_not_match(mocker, script, output, which):
 @pytest.mark.parametrize('script, result', [
     ('vom file.py', ['vim file.py']),
     ('fucck', ['fsck']),
-    ('got commit', ['git commit', 'go commit'])])
+    ('got commit', ['git commit', 'go commit']),
+    ('gti commit -m "new commit"', ['git commit -m "new commit"'])])
 def test_get_new_command(script, result):
     assert get_new_command(Command(script, '')) == result
diff --git a/thefuck/rules/no_command.py b/thefuck/rules/no_command.py
index 03e023b30..086232935 100644
--- a/thefuck/rules/no_command.py
+++ b/thefuck/rules/no_command.py
@@ -35,8 +35,7 @@ def get_new_command(command):
                                                   get_all_executables())
                  if cmd not in new_cmds]
 
-    return [' '.join([new_command] + command.script_parts[1:])
-            for new_command in new_cmds]
+    return [command.script.replace(old_command, cmd, 1) for cmd in new_cmds]
 
 
 priority = 3000

The function git_support can not be useful if a command has the word "git" misspelled.
The purpose of this rule is to unfuck the commands like: gti commit -m 'message'.
Without this rule, for example, if you try to unfuck this command the result will be:
git commit -m message. This means that the quotation marks do not return. #1282

This rule is generally useful for every git command, in which the word git is misspelled.

I have also run some tests!