Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint

* tr/maint-1.6.1-doc-format-patch--root:
  Documentation: format-patch --root clarifications
This commit is contained in:
Junio C Hamano 2009-04-02 12:00:59 -07:00
commit b5a18787bd

View File

@ -39,15 +39,11 @@ There are two ways to specify which commits to operate on.
REVISIONS" section in linkgit:git-rev-parse[1]) means the REVISIONS" section in linkgit:git-rev-parse[1]) means the
commits in the specified range. commits in the specified range.
A single commit, when interpreted as a <revision range> The first rule takes precedence in the case of a single <commit>. To
expression, means "everything that leads to that commit", but apply the second rule, i.e., format everything since the beginning of
if you write 'git format-patch <commit>', the previous rule history up until <commit>, use the '\--root' option: "git format-patch
applies to that command line and you do not get "everything \--root <commit>". If you want to format only <commit> itself, you
since the beginning of the time". If you want to format can do this with "git format-patch -1 <commit>".
everything since project inception to one commit, say "git
format-patch \--root <commit>" to make it clear that it is the
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 By default, each output file is numbered sequentially from 1, and uses the
first line of the commit message (massaged for pathname safety) as first line of the commit message (massaged for pathname safety) as
@ -169,6 +165,13 @@ not add any suffix.
applied. By default the contents of changes in those files are applied. By default the contents of changes in those files are
encoded in the patch. encoded in the patch.
--root::
Treat the revision argument as a <revision range>, even if it
is just a single commit (that would normally be treated as a
<since>). Note that root commits included in the specified
range are always formatted as creation patches, independently
of this flag.
CONFIGURATION CONFIGURATION
------------- -------------
You can specify extra mail header lines to be added to each message You can specify extra mail header lines to be added to each message