Merge branch 'maint-1.6.4' into maint

* maint-1.6.4:
  git-stash documentation: mention default options for 'list'
This commit is contained in:
Junio C Hamano 2009-10-13 01:01:04 -07:00
commit 6ff9ae9f97

View file

@ -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>]::