From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/Documentation/git-format-patch.txt | 51 +++++----------------- 1 file changed, 12 insertions(+), 39 deletions(-) (limited to 'third_party/git/Documentation/git-format-patch.txt') diff --git a/third_party/git/Documentation/git-format-patch.txt b/third_party/git/Documentation/git-format-patch.txt index 0d4f8951bb..b9b97e63ae 100644 --- a/third_party/git/Documentation/git-format-patch.txt +++ b/third_party/git/Documentation/git-format-patch.txt @@ -17,10 +17,9 @@ SYNOPSIS [--signature-file=] [-n | --numbered | -N | --no-numbered] [--start-number ] [--numbered-files] - [--in-reply-to=] [--suffix=.] + [--in-reply-to=Message-Id] [--suffix=.] [--ignore-if-in-upstream] - [--cover-from-description=] - [--rfc] [--subject-prefix=] + [--rfc] [--subject-prefix=Subject-Prefix] [(--reroll-count|-v) ] [--to=] [--cc=] [--[no-]cover-letter] [--quiet] @@ -67,8 +66,7 @@ they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when -`format.outputDirectory` points elsewhere, use `-o .`. All directory -components will be created. +`format.outputDirectory` points elsewhere, use `-o .`. By default, the subject of a single patch is "[PATCH] " followed by the concatenation of lines from the commit message up to the first blank @@ -161,9 +159,9 @@ Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`. ---in-reply-to=:: +--in-reply-to=Message-Id:: Make the first mail (or all the mails with `--no-thread`) appear as a - reply to the given , which avoids breaking threads to + reply to the given Message-Id, which avoids breaking threads to provide a new patch series. --ignore-if-in-upstream:: @@ -173,29 +171,9 @@ will want to ensure that threading is disabled for `git send-email`. patches being generated, and any patch that matches is ignored. ---cover-from-description=:: - Controls which parts of the cover letter will be automatically - populated using the branch's description. -+ -If `` is `message` or `default`, the cover letter subject will be -populated with placeholder text. The body of the cover letter will be -populated with the branch's description. This is the default mode when -no configuration nor command line option is specified. -+ -If `` is `subject`, the first paragraph of the branch description will -populate the cover letter subject. The remainder of the description will -populate the body of the cover letter. -+ -If `` is `auto`, if the first paragraph of the branch description -is greater than 100 bytes, then the mode will be `message`, otherwise -`subject` will be used. -+ -If `` is `none`, both the cover letter subject and body will be -populated with placeholder text. - ---subject-prefix=:: +--subject-prefix=:: Instead of the standard '[PATCH]' prefix in the subject - line, instead use '[]'. This + line, instead use '[]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option. @@ -333,12 +311,10 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`. Output an all-zero hash in each patch's From header instead of the hash of the commit. ---[no-]base[=]:: +--base=:: Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section - below for details. If is "auto", a base commit is - automatically chosen. The `--no-base` option overrides a - `format.useAutoBase` configuration. + below for details. --root:: Treat the revision argument as a , even if it @@ -354,9 +330,8 @@ CONFIGURATION ------------- You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when -outputting more than one patch, add "To:" or "Cc:" headers, configure -attachments, change the patch output directory, and sign off patches -with configuration variables. +outputting more than one patch, add "To" or "Cc:" headers, configure +attachments, and sign off patches with configuration variables. ------------ [format] @@ -368,9 +343,7 @@ with configuration variables. cc = attach [ = mime-boundary-string ] signOff = true - outputDirectory = - coverLetter = auto - coverFromDescription = auto + coverletter = auto ------------ -- cgit 1.4.1