| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add support for combining --merge and --symmetricHEAD1.3master | Mattias Andrée | 2 hours | 1 | -12/+14 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | Add --symmetric1.2 | Mattias Andrée | 22 hours | 1 | -4/+19 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | Add conflcit resultions strategies and interactive mode, and a lot of tests1.1 | Mattias Andrée | 3 days | 1 | -92/+562 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | Fix support for CRLF line endings (which git may actually produce on conflict marker lines)1.0.4 | Mattias Andrée | 2024-11-27 | 1 | -1/+1 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | Use git attributes to determine conflict marker size1.0.3 | Mattias Andrée | 2024-11-16 | 1 | -11/+103 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | Fix segfault bug1.0.2 | Mattias Andrée | 2024-09-13 | 1 | -1/+1 |
| | | | | | Signed-off-by: Mattias Andrée <maandree@kth.se> | ||||
| * | Fix exit value on usage error1.0.1 | Mattias Andrée | 2024-08-16 | 1 | -1/+1 |
| | | | | | Signed-off-by: Mattias Andrée <maandree@kth.se> | ||||
| * | Fix bug1.0 | Mattias Andrée | 2024-08-15 | 1 | -1/+2 |
| | | | | | Signed-off-by: Mattias Andrée <maandree@kth.se> | ||||
| * | Add README and git-rediff.1 | Mattias Andrée | 2024-08-15 | 1 | -1/+1 |
| | | | | | Signed-off-by: Mattias Andrée <maandree@kth.se> | ||||
| * | First commit | Mattias Andrée | 2024-08-15 | 1 | -0/+659 |
| 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 |