git/Documentation/git-format-patch.txt, branch v2.41.2

Merge branch 'ah/format-patch-thread-doc'

2023-04-21T22:35:05Z

Doc update. * ah/format-patch-thread-doc: format-patch: correct documentation of --thread without an argument

format-patch: correct documentation of --thread without an argument

2023-04-03T16:59:20Z

In Git, almost all command line flags unconditionally override the corresponding config option.[1] Add a test to confirm that this is the case for `git format-patch --thread`. [1] https://lore.kernel.org/git/CAMMLpeS3+NUQa2oqpHKVo3yWQNVMgkEXrs4U5_ggvk31yQbezQ@mail.gmail.com/ Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano

e-mail workflow: Message-ID is spelled with ID in both capital letters

2023-04-03T15:55:43Z

We used to write "Message-Id:" and "Message-ID:" pretty much interchangeably, and the header name is defined to be case insensitive by the RFCs, but the canonical form "Message-ID:" is used throughout the RFC documents, so let's imitate it ourselves. Signed-off-by: Junio C Hamano Reviewed-by: Elijah Newren

format-patch: learn format.forceInBodyFrom configuration variable

2022-08-29T21:39:13Z

As the need to use the "--force-in-body-from" option primarily is tied to which mailing list the mails go to (and get their From: address mangled), it is likely that a user who needs to use this option once to interact with their upstream project needs to use it for all patches they send out. Add a configuration variable, suitable for setting in the local configuration file per repository, for this. Signed-off-by: Junio C Hamano

format-patch: allow forcing the use of in-body From: header

2022-08-29T21:39:13Z

Users may be authoring and committing their commits under the same e-mail address they use to send their patches from, in which case they shouldn't need to use the in-body From: line in their outgoing e-mails. At the receiving end, "git am" will use the address on the "From:" header of the incoming e-mail and all should be well. Some mailing lists, however, mangle the From: address from what the original sender had; in such a situation, the user may want to add the in-body "From:" header even for their own patches. "git format-patch --[no-]force-in-body-from" was invented for such users. Signed-off-by: Junio C Hamano

doc: git-format-patch: describe the option --always

2021-12-16T01:04:15Z

This commit has described how to use '--always' option in the command 'git-format-patch' to include patches for commits that emit no changes. Signed-off-by: 徐沛文 (Aleen) Signed-off-by: Junio C Hamano

format-patch (doc): clarify --base=auto

2021-10-23T21:33:20Z

What --base=auto tells format-patch is to compute the base commit itself, using the tracking information. It does not make anything track anything. Tighten the phrasing so that it won't be copied and pasted to other places. Signed-off-by: Junio C Hamano

Merge branch 'jk/doc-format-patch-skips-merges'

2021-05-11T06:27:23Z

Document that "format-patch" skips merges. * jk/doc-format-patch-skips-merges: docs/format-patch: mention handling of merges

docs/format-patch: mention handling of merges

2021-05-03T05:32:39Z

Format-patch doesn't have a way to format merges in a way that can be applied by git-am (or any other tool), and so it just omits them. However, this may be a surprising implication for users who are not well versed in how the tool works. Let's add a note to the documentation making this more clear. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'zh/format-patch-fractional-reroll-count'

2021-04-02T21:43:14Z

"git format-patch -v" learned to allow a reroll count that is not an integer. * zh/format-patch-fractional-reroll-count: format-patch: allow a non-integral version numbers