aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/technical/rerere.txt
AgeCommit message (Expand)AuthorFilesLines
2023-10-09documentation: remove extraneous wordsElijah Newren1-1/+1
2023-10-09documentation: add missing wordsElijah Newren1-1/+1
2023-10-09documentation: fix apostrophe usageElijah Newren1-1/+1
2023-01-23Documentation: render dash correctlyAndrei Rybak1-1/+1
2021-12-01update documentation for new zdiff3 conflictStyleElijah Newren1-5/+5
2019-11-07Documentation: fix a bunch of typos, both old and newElijah Newren1-1/+1
2018-08-29rerere: mention caveat about unmatched conflict markersThomas Gummerer1-0/+4
2018-08-06rerere: teach rerere to handle nested conflictsThomas Gummerer1-0/+42
2018-08-06rerere: add documentation for conflict normalizationThomas Gummerer1-0/+140