summaryrefslogtreecommitdiff
path: root/diffcore-rotate.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-07-02 09:27:55 -0700
committerJunio C Hamano <gitster@pobox.com>2024-07-02 09:27:56 -0700
commitf13710e32e69fd267c61035731af61913db2060b (patch)
tree2e6b6ba10dc42ab9a45992a381a122bbe58ccb1a /diffcore-rotate.c
parent09e5e7f718f3c4259184770da816eb4a7c054d0b (diff)
parentcadcf58085cada6e781444cbdde6d4b0067ebe4c (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
Diffstat (limited to 'diffcore-rotate.c')
0 files changed, 0 insertions, 0 deletions