Merge remote-tracking branch 'origin/master'

Author: schacon

text/16_Stashing/0_ Stashing.markdown

@@ -7,7 +7,7 @@ state of your work, and after fixing the bug (or, optionally after doing
 so on a different branch and then coming back), unstash the
 work-in-progress changes.
 
-    $ git stash "work in progress for foo feature"
+    $ git stash save "work in progress for foo feature"
 
 This command will save your changes away to the `stash`, and
 reset your working tree and the index to match the tip of your