summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-10-13 01:01:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-13 01:01:04 -0700
commit6ff9ae9f97101c30897332f608f35ad232b1faf2 (patch)
treee301a5d90f35a9bfe4ffc9e7dbf4e9550941792d
parentGIT 1.6.5 (diff)
parentgit-stash documentation: mention default options for 'list' (diff)
downloadtgif-6ff9ae9f97101c30897332f608f35ad232b1faf2.tar.xz
Merge branch 'maint-1.6.4' into maint
* maint-1.6.4: 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 3f14b727b8..fafe728f89 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>]::