diff --git a/README.md b/README.md
index 9c9d893d6..95f020607 100644
--- a/README.md
+++ b/README.md
@@ -234,6 +234,7 @@ following rules are enabled by default:
 * `git_branch_0flag` – fixes commands such as `git branch 0v` and `git branch 0r` removing the created branch;
 * `git_checkout` – fixes branch name or creates new branch;
 * `git_clone_git_clone` – replaces `git clone git clone ...` with `git clone ...`
+* `git_commit_add` – offers `git commit -a ...` or `git commit -p ...` after previous commit if it failed because nothing was staged;
 * `git_commit_amend` – offers `git commit --amend` after previous commit;
 * `git_commit_reset` – offers `git reset HEAD~` after previous commit;
 * `git_diff_no_index` – adds `--no-index` to previous `git diff` on untracked files;
diff --git a/tests/rules/test_git_commit_add.py b/tests/rules/test_git_commit_add.py
new file mode 100644
index 000000000..1a244f33e
--- /dev/null
+++ b/tests/rules/test_git_commit_add.py
@@ -0,0 +1,38 @@
+import pytest
+from thefuck.rules.git_commit_add import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize(
+    "script, output",
+    [
+        ('git commit -m "test"', "no changes added to commit"),
+        ("git commit", "no changes added to commit"),
+    ],
+)
+def test_match(output, script):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize(
+    "script, output",
+    [
+        ('git commit -m "test"', " 1 file changed, 15 insertions(+), 14 deletions(-)"),
+        ("git branch foo", ""),
+        ("git checkout feature/test_commit", ""),
+        ("git push", ""),
+    ],
+)
+def test_not_match(output, script):
+    assert not match(Command(script, output))
+
+
+@pytest.mark.parametrize(
+    "script, new_command",
+    [
+        ("git commit", ["git commit -a", "git commit -p"]),
+        ('git commit -m "foo"', ['git commit -a -m "foo"', 'git commit -p -m "foo"']),
+    ],
+)
+def test_get_new_command(script, new_command):
+    assert get_new_command(Command(script, "")) == new_command
diff --git a/thefuck/rules/git_commit_add.py b/thefuck/rules/git_commit_add.py
new file mode 100644
index 000000000..4db1634a4
--- /dev/null
+++ b/thefuck/rules/git_commit_add.py
@@ -0,0 +1,17 @@
+from thefuck.utils import eager, replace_argument
+from thefuck.specific.git import git_support
+
+
+@git_support
+def match(command):
+    return (
+        "commit" in command.script_parts
+        and "no changes added to commit" in command.output
+    )
+
+
+@eager
+@git_support
+def get_new_command(command):
+    for opt in ("-a", "-p"):
+        yield replace_argument(command.script, "commit", "commit {}".format(opt))