Revisions of riff
Dominique Leuenberger (dimstar_suse)
accepted
request 1219357
from
Michael Vetter (jubalh)
(revision 19)
- Update to 3.3.6: * Prevent timeouts on large differences by not doing any refinement on the large sections.
Ana Guerrero (anag+factory)
accepted
request 1217963
from
Michael Vetter (jubalh)
(revision 18)
- Update to 3.3.5: * With this release, many more conflicts are recognized, and changes vs non-changed line parts are marked much more clearly. * This release introduces a --unchanged-style=experimental command line option. Try export RIFF=--unchanged-style=experimental and report back!
Ana Guerrero (anag+factory)
accepted
request 1207061
from
Michael Vetter (jubalh)
(revision 17)
- Update to 3.3.4: * Both by clearly highlighting the markers, and by improving how we color the conflicting areas themselves. * And remember: "git config --global merge.conflictstyle diff3" is your friend!
Ana Guerrero (anag+factory)
accepted
request 1206039
from
Michael Vetter (jubalh)
(revision 16)
- Update to 3.3.3: * With this release, we go from plain LCS to the Patience Diff algorithm. "Patience" is marketed as producing more human friendly diffs. * Additionally, post processing has been tuned to take better decisions on which differences should be highlighted and not.
Ana Guerrero (anag+factory)
accepted
request 1204661
from
Michael Vetter (jubalh)
(revision 15)
- Update to 3.3.2: * Tune what gets highlighted and not
Ana Guerrero (anag+factory)
accepted
request 1202542
from
Michael Vetter (jubalh)
(revision 14)
- Update to 3.3.1: * Tune leading whitespace lowlighting - Update to 3.3.0: * Don't highlight leading whitespace
Ana Guerrero (anag+factory)
accepted
request 1199547
from
Michael Vetter (jubalh)
(revision 13)
- Update to 3.2.1: * Before this release, file names were rendered in all bold. Starting with this release though, the paths are rendered in normal intensity, but the actual file names are kept bold. The goal of this is to improve readability of the output.
Ana Guerrero (anag+factory)
accepted
request 1175436
from
Michael Vetter (jubalh)
(revision 12)
- Update to 3.2.0: * Especially for diff3 conflicts, where we now show unchanged lines vs base in context color: https://stackoverflow.com/questions/27417656/should-diff3-be-default-conflictstyle-on-git * With this release, we are also better at detecting conflict markers in git diff output.
Ana Guerrero (anag+factory)
accepted
request 1173674
from
Michael Vetter (jubalh)
(revision 11)
- Update to 3.1.3: * By doing our best, highlighting parse errors in the output, and then printing an error message after we're done. Before this release, we just panicked on parse errors.
Ana Guerrero (anag+factory)
accepted
request 1166869
from
Michael Vetter (jubalh)
(revision 10)
- Update to 3.1.0: * Aka --ignore-all-space, makes a b c be treated as equal to abc. - Update to 3.0.1: * Before this release, we just removed all color from git --oneline output. With this release, we now retain the existing color for lines we have no special handling for. #62 - Update to 3.0.0: * Starting from now, here's how to integrate with git: git config --global pager.diff riff git config --global pager.show riff git config --global pager.log riff git config --global interactive.diffFilter "riff --color=on" * Note that the interactive.diffFilter has changed. - Update to 2.32.0: * Don't color output when piping - Update to 2.31.1: * Fix a hang with large + / - sections - Update to 2.31.0: * If you do git diff when there are conflict markers, those conflict markers will now be helpfully highlighted. See #56 and #57. and riff will use them primarily * Align diff file timestamp
Ana Guerrero (anag+factory)
accepted
request 1144103
from
Michael Vetter (jubalh)
(revision 9)
- Update to 2.30.1: * Fix crash by handling conflict markers corner cases properly
Ana Guerrero (anag+factory)
accepted
request 1143438
from
Michael Vetter (jubalh)
(revision 8)
- Update to 2.30.0: * Option to put command line options in the RIFF environment variable and riff will use them primarily * --no-adds-only-special flag added * Improved --- and +++ headers highlighting
Ana Guerrero (anag+factory)
accepted
request 1142894
from
Michael Vetter (jubalh)
(revision 7)
- Update to 2.20.1: * Fix losing part of the diff * Align diff file timestamp
Ana Guerrero (anag+factory)
accepted
request 1142714
from
Michael Vetter (jubalh)
(revision 6)
- Update to 2.29.0: * Improve error handling * Improve display
Ana Guerrero (anag+factory)
accepted
request 1141443
from
Michael Vetter (jubalh)
(revision 5)
- Update to 2.28.0: * Conflict markers can be added to files by git merge for example.
Ana Guerrero (anag+factory)
accepted
request 1125797
from
Michael Vetter (jubalh)
(revision 4)
- Update to 2.27.1: * Don't require file names with -b #54.
Ana Guerrero (anag+factory)
accepted
request 1113297
from
Michael Vetter (jubalh)
(revision 3)
- Update to 2.27.0: * Fix crash when you remove a line starting with "--" and passed the diff to riff, riff would crash #51 As a side effect, riff will now be pickier with its input. If you modify your diffs manually, beware.
Dominique Leuenberger (dimstar_suse)
accepted
request 1111775
from
Michael Vetter (jubalh)
(revision 2)
- Update to 2.26.0: * Add -f flag for specifying a diff file to highlight * With this release there are two ways of highlighting a particular diff file: + riff < file.diff + riff --file=file.diff * Command line parsing has been updated to use Clap, which will make help output look somewhat different. Should also fix some options parsing corner cases.
Displaying all 19 revisions