Merge branch 'maint'

gitster · gitster · commit 9ecb2a7f4964 · 2009-10-13T01:01:14.000-07:00
* maint:
  git-stash documentation: mention default options for 'list'
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>]::
 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ stash@{1}: On master: 9cc0589... Add git-stash`
`78`	`78`	`----------------------------------------------------------------`
`79`	`79`	`+`
`80`	`80`	`The command takes options applicable to the 'git-log'`
`81`		`-command to control what is shown and how. See linkgit:git-log[1].`
	`81`	`+command to control what is shown and how. If no options are set, the`
	`82`	+default is `-n 10`. See linkgit:git-log[1].
`82`	`83`
`83`	`84`	`show [<stash>]::`
`84`	`85`