summaryrefslogtreecommitdiff
path: root/Documentation/config/merge.adoc
AgeCommit message (Expand)AuthorFilesLines
2025-06-13merge/pull: extend merge.stat configuration variable to cover --compact-summaryJunio C Hamano1-2/+12
2025-05-27doc: switch merge config description to new synopsis formatJean-Noël Avila1-39/+43
2025-02-21Merge branch 'en/doc-renormalize'Junio C Hamano1-1/+2
2025-01-21doc: use .adoc extension for AsciiDoc filesbrian m. carlson1-0/+125