* [PATCH v2] docs/format-patch: mention handling of merges
@ 2021-05-01 14:13 Jeff King
0 siblings, 0 replies; only message in thread
From: Jeff King @ 2021-05-01 14:13 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Wang Yugui
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 <email@example.com>
This is a re-work of the patch from:
taking into account Junio's suggestion (and also rebased on top of
28e29ee38b, which touches the same intro paragraph).
Documentation/git-format-patch.txt | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 911da181a1..fe2f69d36e 100644
@@ -36,7 +36,7 @@ SYNOPSIS
-Prepare each commit with its "patch" in
+Prepare each non-merge commit with its "patch" in
one "message" per commit, formatted to resemble a UNIX mailbox.
The output of this command is convenient for e-mail submission or
for use with 'git am'.
@@ -740,6 +740,14 @@ use it only when you know the recipient uses Git to apply your patch.
$ git format-patch -3
+Note that `format-patch` will omit merge commits from the output, even
+if they are part of the requested range. A simple "patch" does not
+include enough information for the receiving end to reproduce the same
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-01 14:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-01 14:13 [PATCH v2] docs/format-patch: mention handling of merges Jeff King
Code repositories for project(s) associated with this inbox:
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).