summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.c
AgeCommit message (Expand)AuthorFilesLines
2021-07-26fmt-merge-msg: free newly allocated temporary strings when doneLibravatar Andrzej Hunt1-2/+4
2021-03-13use CALLOC_ARRAYLibravatar René Scharfe1-1/+1
2021-02-22Merge branch 'bc/signed-objects-with-both-hashes'Libravatar Junio C Hamano1-11/+18
2021-02-10gpg-interface: improve interface for parsing tagsLibravatar brian m. carlson1-11/+18
2021-02-05Merge branch 'so/log-diff-merge'Libravatar Junio C Hamano1-1/+2
2020-12-21diff-merges: new function diff_merges_suppress()Libravatar Sergey Organov1-1/+2
2020-10-23fmt-merge-msg: also suppress "into main" by defaultLibravatar Johannes Schindelin1-1/+3
2020-07-30fmt-merge-msg: allow merge destination to be omitted againLibravatar Junio C Hamano1-4/+34
2020-07-30Revert "fmt-merge-msg: stop treating `master` specially"Libravatar Junio C Hamano1-1/+4
2020-06-23fmt-merge-msg: stop treating `master` speciallyLibravatar Johannes Schindelin1-4/+1
2020-05-01Merge branch 'dd/sparse-fixes'Libravatar Junio C Hamano1-1/+1
2020-04-28Merge branch 'dl/libify-a-few'Libravatar Junio C Hamano1-0/+656
2020-03-24Lib-ify fmt-merge-msgLibravatar Denton Liu1-0/+653