summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-13 08:01:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-10-13 08:01:14 (GMT)
commit9ecb2a7f496413b9a6404e4a19f7edee029819b8 (patch)
treee3eced2223d90e82a673a33b84618e78e07ceffd
parent77abcbdc268d048b7a19af405607fb8d14e630ed (diff)
parent6ff9ae9f97101c30897332f608f35ad232b1faf2 (diff)
downloadgit-9ecb2a7f496413b9a6404e4a19f7edee029819b8.zip
git-9ecb2a7f496413b9a6404e4a19f7edee029819b8.tar.gz
git-9ecb2a7f496413b9a6404e4a19f7edee029819b8.tar.bz2
Merge branch 'maint'
* maint: git-stash documentation: mention default options for 'list'
-rw-r--r--Documentation/git-stash.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 3f14b72..fafe728 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -78,7 +78,8 @@ stash@{1}: On master: 9cc0589... Add git-stash
----------------------------------------------------------------
+
The command takes options applicable to the 'git-log'
-command to control what is shown and how. See linkgit:git-log[1].
+command to control what is shown and how. If no options are set, the
+default is `-n 10`. See linkgit:git-log[1].
show [<stash>]::