]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 09e5e7f cadcf58)
Merge branch 'ds/format-patch-rfc-and-k' into maint-2.45
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jul 2024 16:27:55 +0000 (09:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jul 2024 16:27:56 +0000 (09:27 -0700)
commitf13710e32e69fd267c61035731af61913db2060b
tree2e6b6ba10dc42ab9a45992a381a122bbe58ccb1atree | snapshot
parent09e5e7f718f3c4259184770da816eb4a7c054d0bcommit | diff
parentcadcf58085cada6e781444cbdde6d4b0067ebe4ccommit | diff
Merge branch 'ds/format-patch-rfc-and-k' into maint-2.45

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.