summaryrefslogtreecommitdiff
path: root/Documentation/config/merge.txt
AgeCommit message (Expand)Author
2018-11-13Merge branch 'nd/config-split'Junio C Hamano
2018-10-29config.txt: move merge-config.txt to config/Nguyễn Thái Ngọc Duy