Age | Commit message (Expand) | Author |
---|---|---|
2021-12-02 | update documentation for new zdiff3 conflictStyle | Elijah Newren |
2021-07-16 | rename: bump limit defaults yet again | Elijah Newren |
2021-07-16 | doc: clarify documentation for rename/copy limits | Elijah Newren |
2021-06-08 | doc: merge: mention default of defaulttoupstream | Felipe Contreras |
2020-04-10 | merge: teach --autostash option | Denton Liu |
2019-04-08 | merge-recursive: switch directory rename detection default | Elijah Newren |
2018-11-13 | Merge branch 'nd/config-split' | Junio C Hamano |
2018-10-29 | config.txt: move merge-config.txt to config/ | Nguyễn Thái Ngọc Duy |