File tree Expand file tree Collapse file tree 1 file changed +9
-1
lines changed Expand file tree Collapse file tree 1 file changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ SYNOPSIS
36
36
DESCRIPTION
37
37
-----------
38
38
39
- Prepare each commit with its "patch" in
39
+ Prepare each non-merge commit with its "patch" in
40
40
one "message" per commit, formatted to resemble a UNIX mailbox.
41
41
The output of this command is convenient for e-mail submission or
42
42
for use with 'git am'.
@@ -740,6 +740,14 @@ use it only when you know the recipient uses Git to apply your patch.
740
740
$ git format-patch -3
741
741
------------
742
742
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
+
743
751
SEE ALSO
744
752
--------
745
753
linkgit:git-am[1], linkgit:git-send-email[1]
You can’t perform that action at this time.
0 commit comments