summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-04 00:12:19 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-04 00:12:19 -0800
commitb63bc0bc3152ca42ba1c9fa9bed73da061beeca2 (patch)
tree709ceb2c6c62fa58f4d694599374ef10ac305cfe /Documentation/user-manual.txt
parent738a94a9f645a5f63fbccaab76d5e43a97e53d78 (diff)
parentf0817310903312bbc243dd80f066e17a8e0e4b1d (diff)
downloadgit-b63bc0bc3152ca42ba1c9fa9bed73da061beeca2.tar.gz
Merge branch 'maint'
* maint: 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 Conflicts: Makefile
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 19f571ae3b..96af8977f6 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