summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2009-05-28 09:40:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-29 06:52:25 (GMT)
commit7b8988e113b44b9a2d806dde6161c133750c14e5 (patch)
tree0a83de87c1d719fbe5e640deb8b41176f75a6802 /Documentation/user-manual.txt
parente57cb0158209ece040a4b873064504efd7d2ec0e (diff)
downloadgit-7b8988e113b44b9a2d806dde6161c133750c14e5.zip
git-7b8988e113b44b9a2d806dde6161c133750c14e5.tar.gz
git-7b8988e113b44b9a2d806dde6161c133750c14e5.tar.bz2
Documentation: teach stash/pop workflow instead of stash/apply
Recent discussion on the list showed some comments in favour of a stash/pop workflow: http://marc.info/?l=git&m=124234911423358&w=2 http://marc.info/?l=git&m=124235348327711&w=2 Change the stash documentation and examples to document pop in its own right (and apply in terms of pop), and use stash/pop in the examples. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index dbbeb7e..0b88a51 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1520,10 +1520,10 @@ $ git commit -a -m "blorpl: typofix"
------------------------------------------------
After that, you can go back to what you were working on with
-`git stash apply`:
+`git stash pop`:
------------------------------------------------
-$ git stash apply
+$ git stash pop
------------------------------------------------