Merge branch 'maint'

* maint:
format-patch documentation: mention the special case of showing a single commit

diff --combined Documentation/git-format-patch.txt
index ac36ce8717c7519f86907d2dc0165651bab1da3b,7426109f6251b7e4b3b37e0b785157c0d46ee9f7..11a7d772618f48b961d41fb5fe1cb269d7ae7cd1
--- 1/Documentation/git-format-patch.txt
--- 2/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@@ -46,7 -46,8 +46,8 @@@ applies to that command line and you d
  since the beginning of the time".  If you want to format
  everything since project inception to one commit, say "git
  format-patch \--root <commit>" to make it clear that it is the
- latter case.
+ latter case.  If you want to format a single commit, you can do
+ this with "git format-patch -1 <commit>".
  
  By default, each output file is numbered sequentially from 1, and uses the
  first line of the commit message (massaged for pathname safety) as
@@@ -58,10 -59,8 +59,10 @@@ output, unless the --stdout option is s
  If -o is specified, output files are created in <dir>.  Otherwise
  they are created in the current working directory.
  
 -If -n is specified, instead of "[PATCH] Subject", the first line
 -is formatted as "[PATCH n/m] Subject".
 +By default, the subject of a single patch is "[PATCH] First Line" and
 +the subject when multiple patches are output is "[PATCH n/m] First
 +Line". To force 1/1 to be added for a single patch, use -n.  To omit
 +patch numbers from the subject, use -N
  
  If given --thread, 'git-format-patch' will generate In-Reply-To and
  References headers to make the second and subsequent patch mails appear
@@@ -83,7 -82,7 +84,7 @@@ include::diff-options.txt[
  
  -n::
  --numbered::
 -      Name output in '[PATCH n/m]' format.
 +      Name output in '[PATCH n/m]' format, even with a single patch.
  
  -N::
  --no-numbered::