2005-09-08 02:26:23 +02:00
|
|
|
git-format-patch(1)
|
|
|
|
===================
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2006-03-09 17:24:50 +01:00
|
|
|
git-format-patch - Prepare patches for e-mail submission
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2005-12-31 18:37:15 +01:00
|
|
|
[verse]
|
2008-06-30 08:09:04 +02:00
|
|
|
'git format-patch' [-k] [-o <dir> | --stdout] [--thread]
|
2009-02-12 16:51:55 +01:00
|
|
|
[--attach[=<boundary>] | --inline[=<boundary>] |
|
|
|
|
[--no-attach]]
|
2008-02-19 04:56:13 +01:00
|
|
|
[-s | --signoff] [<common diff options>]
|
|
|
|
[-n | --numbered | -N | --no-numbered]
|
|
|
|
[--start-number <n>] [--numbered-files]
|
|
|
|
[--in-reply-to=Message-Id] [--suffix=.<sfx>]
|
|
|
|
[--ignore-if-in-upstream]
|
|
|
|
[--subject-prefix=Subject-Prefix]
|
2008-02-19 08:40:35 +01:00
|
|
|
[--cc=<email>]
|
2008-02-19 04:56:13 +01:00
|
|
|
[--cover-letter]
|
2007-08-28 09:38:48 +02:00
|
|
|
[ <since> | <revision range> ]
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2006-05-31 16:14:08 +02:00
|
|
|
|
2007-08-28 09:38:48 +02:00
|
|
|
Prepare each commit with its patch in
|
2006-05-31 16:14:08 +02:00
|
|
|
one file per commit, formatted to resemble UNIX mailbox format.
|
|
|
|
The output of this command is convenient for e-mail submission or
|
2008-07-03 07:41:41 +02:00
|
|
|
for use with 'git-am'.
|
2005-09-08 08:04:52 +02:00
|
|
|
|
2007-08-28 09:38:48 +02:00
|
|
|
There are two ways to specify which commits to operate on.
|
|
|
|
|
|
|
|
1. A single commit, <since>, specifies that the commits leading
|
|
|
|
to the tip of the current branch that are not in the history
|
|
|
|
that leads to the <since> to be output.
|
|
|
|
|
|
|
|
2. Generic <revision range> expression (see "SPECIFYING
|
2007-12-29 07:20:38 +01:00
|
|
|
REVISIONS" section in linkgit:git-rev-parse[1]) means the
|
2007-08-29 06:58:53 +02:00
|
|
|
commits in the specified range.
|
|
|
|
|
|
|
|
A single commit, when interpreted as a <revision range>
|
|
|
|
expression, means "everything that leads to that commit", but
|
|
|
|
if you write 'git format-patch <commit>', 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 <commit>" to make it clear that it is the
|
2008-11-03 05:45:55 +01:00
|
|
|
latter case. If you want to format a single commit, you can do
|
|
|
|
this with "git format-patch -1 <commit>".
|
2007-08-28 09:38:48 +02:00
|
|
|
|
2007-06-05 22:06:53 +02:00
|
|
|
By default, each output file is numbered sequentially from 1, and uses the
|
2006-05-31 16:14:08 +02:00
|
|
|
first line of the commit message (massaged for pathname safety) as
|
2007-06-05 22:06:53 +02:00
|
|
|
the filename. With the --numbered-files option, the output file names
|
|
|
|
will only be numbers, without the first line of the commit appended.
|
|
|
|
The names of the output files are printed to standard
|
2006-05-31 16:14:08 +02:00
|
|
|
output, unless the --stdout option is specified.
|
2006-02-07 10:37:54 +01:00
|
|
|
|
2006-05-31 16:14:08 +02:00
|
|
|
If -o is specified, output files are created in <dir>. Otherwise
|
|
|
|
they are created in the current working directory.
|
2005-09-08 08:04:52 +02:00
|
|
|
|
2008-10-02 22:55:39 +02:00
|
|
|
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
|
2005-09-08 08:04:52 +02:00
|
|
|
|
2008-07-03 07:41:41 +02:00
|
|
|
If given --thread, 'git-format-patch' will generate In-Reply-To and
|
2006-07-15 02:49:04 +02:00
|
|
|
References headers to make the second and subsequent patch mails appear
|
|
|
|
as replies to the first mail; this also generates a Message-Id header to
|
|
|
|
reference.
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
-------
|
2007-11-15 14:19:29 +01:00
|
|
|
:git-format-patch: 1
|
2007-03-06 04:27:44 +01:00
|
|
|
include::diff-options.txt[]
|
|
|
|
|
2007-07-04 01:38:29 +02:00
|
|
|
-<n>::
|
|
|
|
Limits the number of patches to prepare.
|
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
-o <dir>::
|
|
|
|
--output-directory <dir>::
|
2005-09-08 08:04:52 +02:00
|
|
|
Use <dir> to store the resulting files, instead of the
|
2006-06-06 17:46:23 +02:00
|
|
|
current working directory.
|
2005-09-08 08:04:52 +02:00
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
-n::
|
|
|
|
--numbered::
|
2008-10-02 22:55:39 +02:00
|
|
|
Name output in '[PATCH n/m]' format, even with a single patch.
|
2005-09-08 08:04:52 +02:00
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
-N::
|
|
|
|
--no-numbered::
|
2007-11-04 04:38:24 +01:00
|
|
|
Name output in '[PATCH]' format.
|
|
|
|
|
2006-05-31 16:14:08 +02:00
|
|
|
--start-number <n>::
|
|
|
|
Start numbering the patches at <n> instead of 1.
|
|
|
|
|
2007-06-05 22:06:53 +02:00
|
|
|
--numbered-files::
|
|
|
|
Output file names will be a simple number sequence
|
|
|
|
without the default first line of the commit appended.
|
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
-k::
|
|
|
|
--keep-subject::
|
2005-09-08 08:04:52 +02:00
|
|
|
Do not strip/add '[PATCH]' from the first line of the
|
|
|
|
commit log message.
|
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
-s::
|
|
|
|
--signoff::
|
2005-12-09 00:28:05 +01:00
|
|
|
Add `Signed-off-by:` line to the commit message, using
|
|
|
|
the committer identity of yourself.
|
|
|
|
|
2005-10-06 23:25:52 +02:00
|
|
|
--stdout::
|
2006-05-31 16:14:08 +02:00
|
|
|
Print all commits to the standard output in mbox format,
|
|
|
|
instead of creating a file for each one.
|
2005-08-23 10:49:47 +02:00
|
|
|
|
2007-03-04 00:12:06 +01:00
|
|
|
--attach[=<boundary>]::
|
|
|
|
Create multipart/mixed attachment, the first part of
|
|
|
|
which is the commit message and the patch itself in the
|
|
|
|
second part, with "Content-Disposition: attachment".
|
|
|
|
|
2009-02-12 16:51:55 +01:00
|
|
|
--no-attach::
|
|
|
|
Disable the creation of an attachment, overriding the
|
|
|
|
configuration setting.
|
|
|
|
|
2007-03-04 00:12:06 +01:00
|
|
|
--inline[=<boundary>]::
|
|
|
|
Create multipart/mixed attachment, the first part of
|
|
|
|
which is the commit message and the patch itself in the
|
|
|
|
second part, with "Content-Disposition: inline".
|
2006-03-10 05:47:24 +01:00
|
|
|
|
2009-02-19 22:26:33 +01:00
|
|
|
--thread[=<style>]::
|
2006-07-15 02:49:04 +02:00
|
|
|
Add In-Reply-To and References headers to make the second and
|
|
|
|
subsequent mails appear as replies to the first. Also generates
|
|
|
|
the Message-Id header to reference.
|
2009-02-19 22:26:33 +01:00
|
|
|
+
|
|
|
|
The optional <style> argument can be either `shallow` or `deep`.
|
|
|
|
'Shallow' threading makes every mail a reply to the head of the
|
|
|
|
series, where the head is chosen from the cover letter, the
|
|
|
|
`\--in-reply-to`, and the first patch mail, in this order. 'Deep'
|
|
|
|
threading makes every mail a reply to the previous one. If not
|
|
|
|
specified, defaults to the 'format.thread' configuration, or `shallow`
|
|
|
|
if that is not set.
|
2005-11-05 11:55:18 +01:00
|
|
|
|
2006-07-15 02:49:08 +02:00
|
|
|
--in-reply-to=Message-Id::
|
|
|
|
Make the first mail (or all the mails with --no-thread) appear as a
|
|
|
|
reply to the given Message-Id, which avoids breaking threads to
|
|
|
|
provide a new patch series.
|
|
|
|
|
2007-01-18 12:27:35 +01:00
|
|
|
--ignore-if-in-upstream::
|
|
|
|
Do not include a patch that matches a commit in
|
|
|
|
<until>..<since>. This will examine all patches reachable
|
|
|
|
from <since> but not from <until> and compare them with the
|
|
|
|
patches being generated, and any patch that matches is
|
|
|
|
ignored.
|
|
|
|
|
2007-04-12 01:58:07 +02:00
|
|
|
--subject-prefix=<Subject-Prefix>::
|
|
|
|
Instead of the standard '[PATCH]' prefix in the subject
|
|
|
|
line, instead use '[<Subject-Prefix>]'. This
|
|
|
|
allows for useful naming of a patch series, and can be
|
|
|
|
combined with the --numbered option.
|
|
|
|
|
2008-02-19 08:40:35 +01:00
|
|
|
--cc=<email>::
|
|
|
|
Add a "Cc:" header to the email headers. This is in addition
|
|
|
|
to any configured headers, and may be used multiple times.
|
|
|
|
|
2008-02-19 04:56:13 +01:00
|
|
|
--cover-letter::
|
2008-08-14 19:37:41 +02:00
|
|
|
In addition to the patches, generate a cover letter file
|
|
|
|
containing the shortlog and the overall diffstat. You can
|
|
|
|
fill in a description in the file before sending it out.
|
2008-02-19 04:56:13 +01:00
|
|
|
|
2007-01-17 20:12:03 +01:00
|
|
|
--suffix=.<sfx>::
|
2007-01-18 00:03:39 +01:00
|
|
|
Instead of using `.patch` as the suffix for generated
|
2007-08-24 02:44:13 +02:00
|
|
|
filenames, use specified suffix. A common alternative is
|
2007-01-18 00:03:39 +01:00
|
|
|
`--suffix=.txt`.
|
2007-01-17 20:12:03 +01:00
|
|
|
+
|
|
|
|
Note that you would need to include the leading dot `.` if you
|
|
|
|
want a filename like `0001-description-of-my-change.patch`, and
|
|
|
|
the first letter does not have to be a dot. Leaving it empty would
|
|
|
|
not add any suffix.
|
|
|
|
|
2008-05-10 00:55:43 +02:00
|
|
|
--no-binary::
|
|
|
|
Don't output contents of changes in binary files, just take note
|
|
|
|
that they differ. Note that this disable the patch to be properly
|
|
|
|
applied. By default the contents of changes in those files are
|
|
|
|
encoded in the patch.
|
|
|
|
|
2006-03-10 05:47:59 +01:00
|
|
|
CONFIGURATION
|
|
|
|
-------------
|
2007-11-04 04:38:24 +01:00
|
|
|
You can specify extra mail header lines to be added to each message
|
|
|
|
in the repository configuration, new defaults for the subject prefix
|
2009-02-12 16:51:55 +01:00
|
|
|
and file suffix, control attachements, and number patches when outputting
|
|
|
|
more than one.
|
2006-03-10 05:47:59 +01:00
|
|
|
|
2007-01-18 00:03:39 +01:00
|
|
|
------------
|
2006-03-10 05:47:59 +01:00
|
|
|
[format]
|
2008-07-03 07:03:54 +02:00
|
|
|
headers = "Organization: git-foo\n"
|
|
|
|
subjectprefix = CHANGE
|
|
|
|
suffix = .txt
|
|
|
|
numbered = auto
|
2008-04-26 23:19:06 +02:00
|
|
|
cc = <email>
|
2009-02-12 16:51:55 +01:00
|
|
|
attach [ = mime-boundary-string ]
|
2007-01-18 00:03:39 +01:00
|
|
|
------------
|
2007-01-17 20:12:03 +01:00
|
|
|
|
2006-03-10 05:47:59 +01:00
|
|
|
|
2005-11-05 11:55:18 +01:00
|
|
|
EXAMPLES
|
|
|
|
--------
|
|
|
|
|
2008-05-07 06:29:28 +02:00
|
|
|
* Extract commits between revisions R1 and R2, and apply them on top of
|
2008-07-03 07:41:41 +02:00
|
|
|
the current branch using 'git-am' to cherry-pick them:
|
2008-05-07 06:29:28 +02:00
|
|
|
+
|
|
|
|
------------
|
2008-07-03 07:28:15 +02:00
|
|
|
$ git format-patch -k --stdout R1..R2 | git am -3 -k
|
2008-05-07 06:29:28 +02:00
|
|
|
------------
|
|
|
|
|
|
|
|
* Extract all commits which are in the current branch but not in the
|
|
|
|
origin branch:
|
|
|
|
+
|
|
|
|
------------
|
|
|
|
$ git format-patch origin
|
|
|
|
------------
|
|
|
|
+
|
|
|
|
For each commit a separate file is created in the current directory.
|
|
|
|
|
|
|
|
* Extract all commits that lead to 'origin' since the inception of the
|
|
|
|
project:
|
|
|
|
+
|
|
|
|
------------
|
2008-07-03 06:47:05 +02:00
|
|
|
$ git format-patch --root origin
|
2008-05-07 06:29:28 +02:00
|
|
|
------------
|
|
|
|
|
|
|
|
* The same as the previous one:
|
|
|
|
+
|
|
|
|
------------
|
|
|
|
$ git format-patch -M -B origin
|
|
|
|
------------
|
|
|
|
+
|
|
|
|
Additionally, it detects and handles renames and complete rewrites
|
|
|
|
intelligently to produce a renaming patch. A renaming patch reduces
|
|
|
|
the amount of text output, and generally makes it easier to review it.
|
|
|
|
Note that the "patch" program does not understand renaming patches, so
|
|
|
|
use it only when you know the recipient uses git to apply your patch.
|
|
|
|
|
|
|
|
* Extract three topmost commits from the current branch and format them
|
|
|
|
as e-mailable patches:
|
|
|
|
+
|
|
|
|
------------
|
|
|
|
$ git format-patch -3
|
|
|
|
------------
|
2005-11-05 11:55:18 +01:00
|
|
|
|
2008-05-29 01:55:27 +02:00
|
|
|
SEE ALSO
|
2005-11-05 11:55:18 +01:00
|
|
|
--------
|
2007-12-29 07:20:38 +01:00
|
|
|
linkgit:git-am[1], linkgit:git-send-email[1]
|
2005-11-05 11:55:18 +01:00
|
|
|
|
|
|
|
|
2005-08-23 10:49:47 +02:00
|
|
|
Author
|
|
|
|
------
|
2008-07-21 21:14:42 +02:00
|
|
|
Written by Junio C Hamano <gitster@pobox.com>
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
Documentation
|
|
|
|
--------------
|
|
|
|
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 09:07:32 +02:00
|
|
|
Part of the linkgit:git[1] suite
|