summaryrefslogtreecommitdiffstats
path: root/fmt-merge-msg.c
AgeCommit message (Expand)AuthorLines
2022-04-13revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason-0/+1
2022-01-12Merge branch 'fs/ssh-signing-key-lifetime'Junio C Hamano-1/+1
2022-01-10fmt-merge-msg: prevent use-after-free with signed tagsTaylor Blau-1/+1
2022-01-05Merge branch 'jc/merge-detached-head-name'Junio C Hamano-2/+5
2021-12-20merge: allow to pretend a merge is made into a different branchJunio C Hamano-2/+5
2021-12-09ssh signing: make fmt-merge-msg consider key lifetimeFabian Stelzer-0/+1
2021-12-09ssh signing: use sigc struct to pass payloadFabian Stelzer-2/+2
2021-10-12ssh signing: fmt-merge-msg tests & config parseFabian Stelzer-0/+6
2021-10-12Merge branch 'fs/ssh-signing' into fs/ssh-signing-fixJunio C Hamano-3/+3
2021-09-10ssh signing: preliminary refactoring and clean-upFabian Stelzer-3/+3
2021-07-26fmt-merge-msg: free newly allocated temporary strings when doneAndrzej Hunt-2/+4
2021-03-13use CALLOC_ARRAYRené Scharfe-1/+1
2021-02-22Merge branch 'bc/signed-objects-with-both-hashes'Junio C Hamano-11/+18
2021-02-10gpg-interface: improve interface for parsing tagsbrian m. carlson-11/+18
2021-02-05Merge branch 'so/log-diff-merge'Junio C Hamano-1/+2
2020-12-21diff-merges: new function diff_merges_suppress()Sergey Organov-1/+2
2020-10-23fmt-merge-msg: also suppress "into main" by defaultJohannes Schindelin-1/+3
2020-07-30fmt-merge-msg: allow merge destination to be omitted againJunio C Hamano-4/+34
2020-07-30Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano-1/+4
2020-06-23fmt-merge-msg: stop treating `master` speciallyJohannes Schindelin-4/+1
2020-05-01Merge branch 'dd/sparse-fixes'Junio C Hamano-1/+1
2020-04-28Merge branch 'dl/libify-a-few'Junio C Hamano-0/+656
2020-03-24Lib-ify fmt-merge-msgDenton Liu-0/+653