Signed-off-by: Firmin Martin <firminmartin24@xxxxxxxxx> --- Documentation/git-format-patch.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 911da181a1..49f08b5e51 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -20,6 +20,7 @@ SYNOPSIS [--in-reply-to=<message id>] [--suffix=.<sfx>] [--ignore-if-in-upstream] [--cover-from-description=<mode>] + [--confirm-overwrite=<when>] [--rfc] [--subject-prefix=<subject prefix>] [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] @@ -195,6 +196,7 @@ will want to ensure that threading is disabled for `git send-email`. --cover-from-description=<mode>:: Controls which parts of the cover letter will be automatically populated using the branch's description. + + If `<mode>` is `message` or `default`, the cover letter subject will be populated with placeholder text. The body of the cover letter will be @@ -212,6 +214,23 @@ is greater than 100 bytes, then the mode will be `message`, otherwise If `<mode>` is `none`, both the cover letter subject and body will be populated with placeholder text. +`--confirm-overwrite`=<when>:: + Specifies when Git must ask the user to confirm whether existing + patches or cover letter of the same name should be overwritten. + <when> possible values are: ++ +-- +always;; +never;; + Always/never prompt for confirmation whenever patches or a cover letter + are subject to be overwritten. +cover;; + Ask confirmation whenever a cover letter is subject to be overwritten. +-- ++ +Defaults to the value of the `format.confirmOverwrite` variable, or +"cover" if unconfigured. + --subject-prefix=<subject prefix>:: Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This @@ -409,6 +428,7 @@ with configuration variables. outputDirectory = <directory> coverLetter = auto coverFromDescription = auto + confirmOverwrite = onlyCover ------------ -- 2.31.1.449.g4a44fa8106
