]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 28e29ee) | patch
docs/format-patch: mention handling of merges
authorJeff King <peff@peff.net>
Sat, 1 May 2021 14:13:24 +0000 (10:13 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 May 2021 05:32:39 +0000 (14:32 +0900)
commit8e0601f568ebf512f2edc606bdbf1a508b3c28a6
treeb815b41c65fae5a128c9bc1a1f591f0bb4906ef8tree | snapshot
parent28e29ee38b59c54d199c4ef42a77173e2090ccdbcommit | diff
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>
Documentation/git-format-patch.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.