| Commit message (Collapse) | Author | Files | Lines | ||
|---|---|---|---|---|---|
| 4 hours | Add support for combining --merge and --symmetricHEAD1.3master | Mattias Andrée | 1 | -1/+1 | |
| Signed-off-by: Mattias Andrée <m@maandree.se> | |||||
| 24 hours | Add --symmetric1.2 | Mattias Andrée | 1 | -2/+20 | |
| Signed-off-by: Mattias Andrée <m@maandree.se> | |||||
| 3 days | Add conflcit resultions strategies and interactive mode, and a lot of tests1.1 | Mattias Andrée | 1 | -3/+107 | |
| Signed-off-by: Mattias Andrée <m@maandree.se> | |||||
| 2026-02-22 | fix doc text1.0.5 | Mattias Andrée | 1 | -2/+2 | |
| Signed-off-by: Mattias Andrée <m@maandree.se> | |||||
| 2024-08-15 | Fix typo | Mattias Andrée | 1 | -1/+1 | |
| Signed-off-by: Mattias Andrée <maandree@kth.se> | |||||
| 2024-08-15 | Add README and git-rediff.1 | Mattias Andrée | 1 | -0/+34 | |
| Signed-off-by: Mattias Andrée <maandree@kth.se> | |||||
 |
index : git-rediff | |
| [Complete] Reduce partially resolved merge conflicts | Mattias Andrée <m@maandree.se> |
| aboutsummaryrefslogtreecommitdiffstats |