diff --git a/pages/common/git-stash.md b/pages/common/git-stash.md
index 4c5919891..aee89cd9b 100644
--- a/pages/common/git-stash.md
+++ b/pages/common/git-stash.md
@@ -4,24 +4,24 @@
 
 - Stash current changes (except new files):
 
-`git stash save {{optional_stash_name}}`
+`git stash save {{optional_stash_message}}`
 
 - Include new files in the stash (leaves the index completely clean):
 
-`git stash save -u {{optional_stash_name}}`
+`git stash save -u {{optional_stash_message}}`
 
 - List all stashes:
 
 `git stash list`
 
-- Re-apply the latest stash:
+- Apply a stash (default is the latest, named stash@{0}):
 
-`git stash pop`
+`git stash apply {{optional_stash_name_or_commit}}`
 
-- Re-apply a stash by name:
+- Apply a stash (default is stash@{0}), and remove it from the list if applying doesn't cause conflicts:
 
-`git stash apply {{stash_name}}`
+`git stash pop {{optional_stash_name}}`
 
-- Drop a stash by an index:
+- Drop a stash (default is stash@{0}):
 
-`git stash drop stash@{index}`
+`git stash drop {{optional_stash_name}}`