summaryrefslogtreecommitdiff
path: root/Documentation/config/merge.txt
AgeCommit message (Expand)AuthorFilesLines
2021-12-01update documentation for new zdiff3 conflictStyleLibravatar Elijah Newren1-1/+8
2021-07-15rename: bump limit defaults yet againLibravatar Elijah Newren1-1/+1
2021-07-15doc: clarify documentation for rename/copy limitsLibravatar Elijah Newren1-4/+6
2021-06-08doc: merge: mention default of defaulttoupstreamLibravatar Felipe Contreras1-1/+1
2020-04-10merge: teach --autostash optionLibravatar Denton Liu1-0/+10
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