Skip to content

Commit 270f8bf

Browse files
committed
Merge branch 'jk/doc-format-patch-skips-merges'
Document that "format-patch" skips merges. * jk/doc-format-patch-skips-merges: docs/format-patch: mention handling of merges
2 parents 0b77301 + 8e0601f commit 270f8bf

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

Documentation/git-format-patch.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ SYNOPSIS
3636
DESCRIPTION
3737
-----------
3838

39-
Prepare each commit with its "patch" in
39+
Prepare each non-merge commit with its "patch" in
4040
one "message" per commit, formatted to resemble a UNIX mailbox.
4141
The output of this command is convenient for e-mail submission or
4242
for use with 'git am'.
@@ -740,6 +740,14 @@ use it only when you know the recipient uses Git to apply your patch.
740740
$ git format-patch -3
741741
------------
742742

743+
CAVEATS
744+
-------
745+
746+
Note that `format-patch` will omit merge commits from the output, even
747+
if they are part of the requested range. A simple "patch" does not
748+
include enough information for the receiving end to reproduce the same
749+
merge commit.
750+
743751
SEE ALSO
744752
--------
745753
linkgit:git-am[1], linkgit:git-send-email[1]

0 commit comments

Comments
 (0)