summaryrefslogtreecommitdiff
path: root/Documentation/technical/rerere.txt
AgeCommit message (Expand)Author
2019-11-07Documentation: fix a bunch of typos, both old and newElijah Newren
2018-08-29rerere: mention caveat about unmatched conflict markersThomas Gummerer
2018-08-06rerere: teach rerere to handle nested conflictsThomas Gummerer
2018-08-06rerere: add documentation for conflict normalizationThomas Gummerer