| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | documentation: remove extraneous words | Elijah Newren | 2023-10-09 | 1 | -1/+1 |
| * | documentation: add missing words | Elijah Newren | 2023-10-09 | 1 | -1/+1 |
| * | documentation: fix apostrophe usage | Elijah Newren | 2023-10-09 | 1 | -1/+1 |
| * | Documentation: render dash correctly | Andrei Rybak | 2023-01-23 | 1 | -1/+1 |
| * | update documentation for new zdiff3 conflictStyle | Elijah Newren | 2021-12-01 | 1 | -5/+5 |
| * | Documentation: fix a bunch of typos, both old and new | Elijah Newren | 2019-11-07 | 1 | -1/+1 |
| * | rerere: mention caveat about unmatched conflict markers | Thomas Gummerer | 2018-08-29 | 1 | -0/+4 |
| * | rerere: teach rerere to handle nested conflicts | Thomas Gummerer | 2018-08-06 | 1 | -0/+42 |
| * | rerere: add documentation for conflict normalization | Thomas Gummerer | 2018-08-06 | 1 | -0/+140 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |