]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/receive-pack.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 55e5548 cadcf58)
Merge branch 'ds/format-patch-rfc-and-k'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Apr 2024 21:49:42 +0000 (14:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Apr 2024 21:49:42 +0000 (14:49 -0700)
commit07fc8275e1b41c8e256edb0e42483d317adfdb91
tree6277637c2494f318c008c6c0aa82b547d36631e1tree | snapshot
parent55e5548a0f62b2b9a4e22d585320d23c06eeee65commit | diff
parentcadcf58085cada6e781444cbdde6d4b0067ebe4ccommit | diff
Merge branch 'ds/format-patch-rfc-and-k'

The "-k" and "--rfc" options of "format-patch" will now error out
when used together, as one tells us not to add anything to the
title of the commit, and the other one tells us to add "RFC" in
addition to "PATCH".

* ds/format-patch-rfc-and-k:
  format-patch: ensure that --rfc and -k are mutually exclusive
builtin/log.c diff1 | diff2 | blob | history
t/t4014-format-patch.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.