diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-05 15:41:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-05 15:41:41 -0800 |
| commit | 2247b45c607675a5bf7813380c5c63ab24aaba36 (patch) | |
| tree | 7576ec9249df898dda146ac133ff230c699a3d6b /Documentation | |
| parent | Merge branch 'sr/force-rebase' (diff) | |
| parent | Enable setting attach as the default in .gitconfig for git-format-patch. (diff) | |
| download | tgif-2247b45c607675a5bf7813380c5c63ab24aaba36.tar.xz | |
Merge branch 'jw/format-patch-attach'
* jw/format-patch-attach:
Enable setting attach as the default in .gitconfig for git-format-patch.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-format-patch.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 11a7d77261..e7ae8cf109 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -10,7 +10,8 @@ SYNOPSIS -------- [verse] 'git format-patch' [-k] [-o <dir> | --stdout] [--thread] - [--attach[=<boundary>] | --inline[=<boundary>]] + [--attach[=<boundary>] | --inline[=<boundary>] | + [--no-attach]] [-s | --signoff] [<common diff options>] [-n | --numbered | -N | --no-numbered] [--start-number <n>] [--numbered-files] @@ -117,6 +118,10 @@ include::diff-options.txt[] which is the commit message and the patch itself in the second part, with "Content-Disposition: attachment". +--no-attach:: + Disable the creation of an attachment, overriding the + configuration setting. + --inline[=<boundary>]:: Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the @@ -174,7 +179,8 @@ CONFIGURATION ------------- You can specify extra mail header lines to be added to each message in the repository configuration, new defaults for the subject prefix -and file suffix, and number patches when outputting more than one. +and file suffix, control attachements, and number patches when outputting +more than one. ------------ [format] @@ -183,6 +189,7 @@ and file suffix, and number patches when outputting more than one. suffix = .txt numbered = auto cc = <email> + attach [ = mime-boundary-string ] ------------ |