summaryrefslogtreecommitdiffstats
path: root/fmt-merge-msg.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-141-1/+1
* Merge branch 'bc/signed-objects-with-both-hashes'Junio C Hamano2021-02-231-11/+18
|\
| * gpg-interface: improve interface for parsing tagsbrian m. carlson2021-02-111-11/+18
* | Merge branch 'so/log-diff-merge'Junio C Hamano2021-02-061-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-241-4/+1
* Merge branch 'dd/sparse-fixes'Junio C Hamano2020-05-011-1/+1
* Merge branch 'dl/libify-a-few'Junio C Hamano2020-04-291-4/+7
* Lib-ify fmt-merge-msgDenton Liu2020-03-241-0/+653