diff options
| author |  Jeff King <peff@peff.net> | 2021-05-01 10:13:24 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-05-03 14:32:39 +0900 |
| commit | 8e0601f568ebf512f2edc606bdbf1a508b3c28a6 (patch) | |
| tree | b815b41c65fae5a128c9bc1a1f591f0bb4906ef8 /Documentation/RelNotes/2.25.1.txt | |
| parent | format-patch: give an overview of what a "patch" message is (diff) | |
| download | tgif-8e0601f568ebf512f2edc606bdbf1a508b3c28a6.tar.xz | |
docs/format-patch: mention handling of merges
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/2.25.1.txt')
0 files changed, 0 insertions, 0 deletions