summaryrefslogtreecommitdiff
path: root/Documentation/config/merge.txt
AgeCommit message (Expand)Author
2021-07-15rename: bump limit defaults yet againElijah Newren
2021-07-15doc: clarify documentation for rename/copy limitsElijah Newren
2021-06-08doc: merge: mention default of defaulttoupstreamFelipe Contreras
2020-04-10merge: teach --autostash optionDenton Liu
2019-04-08merge-recursive: switch directory rename detection defaultElijah Newren
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