Merge branch 'maint-1.6.4' into maint

* maint-1.6.4: git-stash documentation: mention default options for 'list'
git-mirror · Oct 13, 2009 · 6ff9ae9 · 6ff9ae9
2 parents 78d553b + 0a0c342
commit 6ff9ae9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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>]::