summaryrefslogtreecommitdiff
path: root/Documentation/config/merge.txt
AgeCommit message (Expand)AuthorFilesLines
2019-04-08merge-recursive: switch directory rename detection defaultLibravatar Elijah Newren1-3/+16
2018-11-13Merge branch 'nd/config-split'Libravatar Junio C Hamano1-0/+93
2018-10-29config.txt: move merge-config.txt to config/Libravatar Nguyễn Thái Ngọc Duy1-0/+87