summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.c
Commit message (Expand)AuthorAgeFilesLines
* 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