![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 574cf76dca2194e9d13d5db384d39409a9095740..111d7c60bf1832bbfc27f8b819da77b8761236da 100644 (file)
SYNOPSIS
--------
[verse]
SYNOPSIS
--------
[verse]
-'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [--thread]
- [-s | --signoff] [--diff-options] [--start-number <n>]
+'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--thread]
+ [--attach[=<boundary>] | --inline[=<boundary>]]
+ [-s | --signoff] [<common diff options>] [--start-number <n>]
[--in-reply-to=Message-Id] [--suffix=.<sfx>]
[--in-reply-to=Message-Id] [--suffix=.<sfx>]
+ [--ignore-if-in-upstream]
<since>[..<until>]
DESCRIPTION
<since>[..<until>]
DESCRIPTION
OPTIONS
-------
OPTIONS
-------
+include::diff-options.txt[]
+
-o|--output-directory <dir>::
Use <dir> to store the resulting files, instead of the
current working directory.
-o|--output-directory <dir>::
Use <dir> to store the resulting files, instead of the
current working directory.
Print all commits to the standard output in mbox format,
instead of creating a file for each one.
Print all commits to the standard output in mbox format,
instead of creating a file for each one.
---attach::
- Create attachments instead of inlining patches.
+--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".
+
+--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".
--thread::
Add In-Reply-To and References headers to make the second and
--thread::
Add In-Reply-To and References headers to make the second and
reply to the given Message-Id, which avoids breaking threads to
provide a new patch series.
reply to the given Message-Id, which avoids breaking threads to
provide a new patch series.
+--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.
+
--suffix=.<sfx>::
--suffix=.<sfx>::
- Instead of using `.txt` as the suffix for generated
+ Instead of using `.patch` as the suffix for generated
filenames, use specifed suffix. A common alternative is
filenames, use specifed suffix. A common alternative is
- `--suffix=.patch`.
+ `--suffix=.txt`.
+
Note that you would need to include the leading dot `.` if you
want a filename like `0001-description-of-my-change.patch`, and
+
Note that you would need to include the leading dot `.` if you
want a filename like `0001-description-of-my-change.patch`, and
CONFIGURATION
-------------
You can specify extra mail header lines to be added to each
CONFIGURATION
-------------
You can specify extra mail header lines to be added to each
-message in the repository configuration as follows:
+message in the repository configuration. Also you can specify
+the default suffix different from the built-in one:
+------------
[format]
headers = "Organization: git-foo\n"
[format]
headers = "Organization: git-foo\n"
-
-You can specify default suffix used:
-
-[format]
- suffix = .patch
+ suffix = .txt
+------------
EXAMPLES
EXAMPLES
understand renaming patches, so use it only when you know
the recipient uses git to apply your patch.
understand renaming patches, so use it only when you know
the recipient uses git to apply your patch.
+git-format-patch -3::
+ Extract three topmost commits from the current branch
+ and format them as e-mailable patches.
See Also
--------
See Also
--------