summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.c
AgeCommit message (Expand)Author
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano
2023-07-06Merge branch 'gc/config-context'Junio C Hamano
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan
2023-06-28config: pass kvi to die_bad_number()Glen Choo
2023-06-28config: add ctx arg to config_fn_tGlen Choo
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren
2023-06-21git-compat-util.h: remove unneccessary include of wildmatch.hElijah Newren
2023-06-12strbuf: remove global variableCalvin Wan
2023-04-11treewide: remove cache.h inclusion due to object-name.h changesElijah Newren
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano
2023-03-28cocci: apply the "pretty.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-21environment: move comment_line_char from cache.hElijah Newren
2023-03-21treewide: remove unnecessary cache.h inclusion from a few headersElijah Newren
2023-03-17Merge branch 'jc/gpg-lazy-init'Junio C Hamano
2023-02-24cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren
2023-02-24alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren
2023-02-24treewide: ensure one of the appropriate headers is sourced firstElijah Newren
2023-02-10gpg-interface: lazily initialize and read the configurationJunio C Hamano
2022-04-14revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason
2022-01-12Merge branch 'fs/ssh-signing-key-lifetime'Junio C Hamano
2022-01-10fmt-merge-msg: prevent use-after-free with signed tagsTaylor Blau
2022-01-05Merge branch 'jc/merge-detached-head-name'Junio C Hamano
2021-12-20merge: allow to pretend a merge is made into a different branchJunio C Hamano
2021-12-09ssh signing: make fmt-merge-msg consider key lifetimeFabian Stelzer
2021-12-09ssh signing: use sigc struct to pass payloadFabian Stelzer
2021-10-12ssh signing: fmt-merge-msg tests & config parseFabian Stelzer
2021-10-12Merge branch 'fs/ssh-signing' into fs/ssh-signing-fixJunio C Hamano
2021-09-10ssh signing: preliminary refactoring and clean-upFabian Stelzer
2021-07-26fmt-merge-msg: free newly allocated temporary strings when doneAndrzej Hunt
2021-03-14use CALLOC_ARRAYRené Scharfe
2021-02-23Merge branch 'bc/signed-objects-with-both-hashes'Junio C Hamano
2021-02-11gpg-interface: improve interface for parsing tagsbrian m. carlson
2021-02-06Merge branch 'so/log-diff-merge'Junio C Hamano
2020-12-21diff-merges: new function diff_merges_suppress()Sergey Organov
2020-10-23fmt-merge-msg: also suppress "into main" by defaultJohannes Schindelin
2020-07-30fmt-merge-msg: allow merge destination to be omitted againJunio C Hamano
2020-07-30Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano
2020-06-24fmt-merge-msg: stop treating `master` speciallyJohannes Schindelin
2020-05-01Merge branch 'dd/sparse-fixes'Junio C Hamano
2020-04-28Merge branch 'dl/libify-a-few'Junio C Hamano
2020-03-24Lib-ify fmt-merge-msgDenton Liu