From: Junio C Hamano Date: Thu, 2 Apr 2009 05:49:24 +0000 (-0700) Subject: Merge branch 'mh/format-patch-add-header' X-Git-Tag: v1.6.3-rc0~48 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/37a13acb2e9ec58c9dd8ee81a48dd4fa6d90ff29?ds=inline;hp=-c Merge branch 'mh/format-patch-add-header' * mh/format-patch-add-header: format-patch: add arbitrary email headers --- 37a13acb2e9ec58c9dd8ee81a48dd4fa6d90ff29 diff --combined Documentation/git-format-patch.txt index c105925df8,51fd716902..db3bdb5657 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@@ -40,11 -40,15 +40,11 @@@ There are two ways to specify which com REVISIONS" section in linkgit:git-rev-parse[1]) means the commits in the specified range. -A single commit, when interpreted as a -expression, means "everything that leads to that commit", but -if you write 'git format-patch ', the previous rule -applies to that command line and you do not get "everything -since the beginning of the time". If you want to format -everything since project inception to one commit, say "git -format-patch \--root " 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 ". +The first rule takes precedence in the case of a single . To +apply the second rule, i.e., format everything since the beginning of +history up until , use the '\--root' option: "git format-patch +\--root ". If you want to format only itself, you +can do this with "git format-patch -1 ". By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as @@@ -157,6 -161,11 +157,11 @@@ if that is not set Add a "Cc:" header to the email headers. This is in addition to any configured headers, and may be used multiple times. + --add-header=
:: + Add an arbitrary header to the email headers. This is in addition + to any configured headers, and may be used multiple times. + For example, --add-header="Organization: git-foo" + --cover-letter:: In addition to the patches, generate a cover letter file containing the shortlog and the overall diffstat. You can @@@ -178,13 -187,6 +183,13 @@@ not add any suffix applied. By default the contents of changes in those files are encoded in the patch. +--root:: + Treat the revision argument as a , even if it + is just a single commit (that would normally be treated as a + ). Note that root commits included in the specified + range are always formatted as creation patches, independently + of this flag. + CONFIGURATION ------------- You can specify extra mail header lines to be added to each message