Merge branch 'maint'

* maint:
git-stash documentation: mention default options for 'list'

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 3f14b727b899fbf3b4f7cb6513bd1b14e5938160..fafe728f890d5020ffc5f1ab28deb4b3d02313a5 100644 (file)
--- 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>]::