使用“diff-highlight”进行差异

Question

我已经将diff-highlight设置为 git 的分页器/荧光笔。

[pager]
    log = diff-highlight | less
    show = diff-highlight | less
    diff = diff-highlight | less

效果很好。

但是如何将 diff-highlight 用于普通 diff 呢？

Answer 1

您可以定义一个函数：

\n\n

diff() { /usr/bin/diff "$@" | diff-highlight }\n

\n\n

diff-highlight处理统一差异 ( diff -u) 但管道其他格式似乎可以工作 \xe2\x80\x94 它通过它们不变。

\n\n

为了近似您使用 获得的行为git diff，您\xe2\x80\x99dcolordiff还需要：

\n\n

diff() { colordiff -u "$@" | diff-highlight | less -FRX }\n

\n