summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-04 07:50:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-04 07:50:09 (GMT)
commitf0817310903312bbc243dd80f066e17a8e0e4b1d (patch)
treefd619c9bf1e11ee6ea1ad5d6a000f96146f916b6 /Documentation/user-manual.txt
parent281907574ca420cc9a800190509adbf89bf9a2d1 (diff)
parent7a85f6ae88be5937c32a7b61601a40a02c03fb3f (diff)
downloadgit-f0817310903312bbc243dd80f066e17a8e0e4b1d.zip
git-f0817310903312bbc243dd80f066e17a8e0e4b1d.tar.gz
git-f0817310903312bbc243dd80f066e17a8e0e4b1d.tar.bz2
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: User-manual: "git stash <comment>" form is long gone add test-dump-cache-tree in Makefile fix typo in Documentation apply: fix access to an uninitialized mode variable, found by valgrind
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 19f571a..96af8977 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1507,7 +1507,7 @@ 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