diff --git a/tests/rules/test_git_stash_pop.py b/tests/rules/test_git_stash_pop.py
index 2e0578e4..b82f0d56 100644
--- a/tests/rules/test_git_stash_pop.py
+++ b/tests/rules/test_git_stash_pop.py
@@ -15,4 +15,4 @@ def test_match(stderr):
 
 def test_get_new_command(stderr):
     assert (get_new_command(Command('git stash pop', stderr=stderr))
-            == "git add . && git stash pop && git reset .")
+            == "git add --update && git stash pop && git reset .")
diff --git a/thefuck/rules/git_stash_pop.py b/thefuck/rules/git_stash_pop.py
index 2073c234..b8281362 100644
--- a/thefuck/rules/git_stash_pop.py
+++ b/thefuck/rules/git_stash_pop.py
@@ -11,7 +11,7 @@ def match(command):
 
 @git_support
 def get_new_command(command):
-    return shell.and_('git add .', 'git stash pop', 'git reset .')
+    return shell.and_('git add --update', 'git stash pop', 'git reset .')
 
 
 # make it come before the other applicable rules