diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-12 14:22:19 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-12 14:22:19 +0900 |
| commit | 51a55bc4ecf70f5836e65d13a82c613e070ac990 (patch) | |
| tree | d880c033a10533f5379a99968f475d667d3fd40f /git-format-patch.txt | |
| parent | cd56dd5585d64b65937fe5001d2f24fa39f254dd (diff) | |
| download | git-htmldocs-51a55bc4ecf70f5836e65d13a82c613e070ac990.tar.gz | |
Autogenerated HTML docs for v2.31.1-606-gdf6c4f
Diffstat (limited to 'git-format-patch.txt')
| -rw-r--r-- | git-format-patch.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/git-format-patch.txt b/git-format-patch.txt index 911da181a..fe2f69d36 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -36,7 +36,7 @@ SYNOPSIS DESCRIPTION ----------- -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 ------------ +CAVEATS +------- + +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 +merge commit. + SEE ALSO -------- linkgit:git-am[1], linkgit:git-send-email[1] |