summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2021-05-01 14:13:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-05-03 05:32:39 (GMT)
commit8e0601f568ebf512f2edc606bdbf1a508b3c28a6 (patch)
treeb815b41c65fae5a128c9bc1a1f591f0bb4906ef8 /t
parent28e29ee38b59c54d199c4ef42a77173e2090ccdb (diff)
downloadgit-8e0601f568ebf512f2edc606bdbf1a508b3c28a6.zip
git-8e0601f568ebf512f2edc606bdbf1a508b3c28a6.tar.gz
git-8e0601f568ebf512f2edc606bdbf1a508b3c28a6.tar.bz2
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 't')
0 files changed, 0 insertions, 0 deletions