aboutsummaryrefslogtreecommitdiffstats
BranchCommit messageAuthorAge
masterMake ^L redrawMattias Andrée4 days
 
TagDownloadAuthorAge
1.3.1git-rediff-1.3.1.tar.gz  git-rediff-1.3.1.tar.bz2  git-rediff-1.3.1.tar.xz  Mattias Andrée4 days
1.3git-rediff-1.3.tar.gz  git-rediff-1.3.tar.bz2  git-rediff-1.3.tar.xz  Mattias Andrée3 weeks
1.2git-rediff-1.2.tar.gz  git-rediff-1.2.tar.bz2  git-rediff-1.2.tar.xz  Mattias Andrée3 weeks
1.1git-rediff-1.1.tar.gz  git-rediff-1.1.tar.bz2  git-rediff-1.1.tar.xz  Mattias Andrée3 weeks
1.0.5git-rediff-1.0.5.tar.gz  git-rediff-1.0.5.tar.bz2  git-rediff-1.0.5.tar.xz  Mattias Andrée8 months
1.0.4git-rediff-1.0.4.tar.gz  git-rediff-1.0.4.tar.bz2  git-rediff-1.0.4.tar.xz  Mattias Andrée23 months
1.0.3git-rediff-1.0.3.tar.gz  git-rediff-1.0.3.tar.bz2  git-rediff-1.0.3.tar.xz  Mattias Andrée23 months
1.0.2git-rediff-1.0.2.tar.gz  git-rediff-1.0.2.tar.bz2  git-rediff-1.0.2.tar.xz  Mattias Andrée2 years
1.0.1git-rediff-1.0.1.tar.gz  git-rediff-1.0.1.tar.bz2  git-rediff-1.0.1.tar.xz  Mattias Andrée2 years
1.0git-rediff-1.0.tar.gz  git-rediff-1.0.tar.bz2  git-rediff-1.0.tar.xz  Mattias Andrée2 years
 
AgeCommit messageAuthorFilesLines
4 daysMake ^L redrawHEAD1.3.1masterMattias Andrée4-0/+46
2026-09-25Add support for combining --merge and --symmetric1.3Mattias Andrée9-102/+126
2026-09-24Add --symmetric1.2Mattias Andrée43-30/+876
2026-09-22Add conflcit resultions strategies and interactive mode, and a lot of tests1.1Mattias Andrée186-100/+5891
2026-02-22fix doc text1.0.5Mattias Andrée2-3/+3
2024-11-27Fix support for CRLF line endings (which git may actually produce on conflict marker lines)1.0.4Mattias Andrée1-1/+1
2024-11-16Use git attributes to determine conflict marker size1.0.3Mattias Andrée1-11/+103
2024-10-06Update e-mailMattias Andrée1-1/+1
2024-09-13Fix segfault bug1.0.2Mattias Andrée1-1/+1
2024-08-16Fix exit value on usage error1.0.1Mattias Andrée1-1/+1
[...]
 
Clone
git://git.maandree.se/git-rediff
https://git.maandree.se/git-rediff
ssh://$USER@maandree.se/gitrepos/git-rediff
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-14 01:29:56 +0000