summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.c
Commit message (Expand)AuthorAgeFilesLines
* treewide: remove cache.h inclusion due to object-name.h changesElijah Newren2023-04-111-1/+1
* object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
* Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-5/+10
|\
| * cocci: apply the "pretty.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+2
| * cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+2
| * cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-2/+3
| * cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+3
* | environment: move comment_line_char from cache.hElijah Newren2023-03-211-0/+1
* | treewide: remove unnecessary cache.h inclusion from a few headersElijah Newren2023-03-211-1/+1
* | Merge branch 'jc/gpg-lazy-init'Junio C Hamano2023-03-171-5/+0
|\ \
| * | gpg-interface: lazily initialize and read the configurationJunio C Hamano2023-02-091-5/+0
| |/
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-231-0/+1
* | alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren2023-02-231-0/+1
* | treewide: ensure one of the appropriate headers is sourced firstElijah Newren2023-02-231-0/+1
|/
* revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason2022-04-131-0/+1
* Merge branch 'fs/ssh-signing-key-lifetime'Junio C Hamano2022-01-121-1/+1
|\
| * fmt-merge-msg: prevent use-after-free with signed tagsTaylor Blau2022-01-101-1/+1
* | Merge branch 'jc/merge-detached-head-name'Junio C Hamano2022-01-051-2/+5
|\ \ | |/ |/|
| * merge: allow to pretend a merge is made into a different branchJunio C Hamano2021-12-201-2/+5
* | ssh signing: make fmt-merge-msg consider key lifetimeFabian Stelzer2021-12-091-0/+1
* | ssh signing: use sigc struct to pass payloadFabian Stelzer2021-12-091-2/+2
|/
* ssh signing: fmt-merge-msg tests & config parseFabian Stelzer2021-10-121-0/+6
* Merge branch 'fs/ssh-signing' into fs/ssh-signing-fixJunio C Hamano2021-10-121-3/+3
|\
| * ssh signing: preliminary refactoring and clean-upFabian Stelzer2021-09-101-3/+3
* | fmt-merge-msg: free newly allocated temporary strings when doneAndrzej Hunt2021-07-261-2/+4
|/
* use CALLOC_ARRAYRené Scharfe2021-03-131-1/+1
* Merge branch 'bc/signed-objects-with-both-hashes'Junio C Hamano2021-02-221-11/+18
|\
| * gpg-interface: improve interface for parsing tagsbrian m. carlson2021-02-101-11/+18
* | Merge branch 'so/log-diff-merge'Junio C Hamano2021-02-051-1/+2
|\ \ | |/ |/|
| * diff-merges: new function diff_merges_suppress()Sergey Organov2020-12-211-1/+2
* | fmt-merge-msg: also suppress "into main" by defaultJohannes Schindelin2020-10-231-1/+3
|/
* fmt-merge-msg: allow merge destination to be omitted againJunio C Hamano2020-07-301-4/+34
* Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano2020-07-301-1/+4
* fmt-merge-msg: stop treating `master` speciallyJohannes Schindelin2020-06-231-4/+1
* Merge branch 'dd/sparse-fixes'Junio C Hamano2020-05-011-1/+1
* Merge branch 'dl/libify-a-few'Junio C Hamano2020-04-281-4/+7
* Lib-ify fmt-merge-msgDenton Liu2020-03-241-0/+653
View Lorry Controller Status