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