help-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Tweaking magit/diff mode to be more helpful in text editing


From: Yuri Khan
Subject: Re: Tweaking magit/diff mode to be more helpful in text editing
Date: Wed, 1 Jun 2016 10:17:11 +0600

On Wed, Jun 1, 2016 at 10:00 AM, Eric Abrahamsen
<address@hidden> wrote:
> <address@hidden> writes:

> I just found wdiff[1]! This looks to be exactly what I want, and it's
> got the right brand, too :) There's also something called adiff.
>
> I've installed it, and tweaked my git config so that I can call "git
> difftool --tool=wdiff" and see the diff using wdiff. Right now it spits
> out the whole file, not just changes-plus-context, but presumably I can
> figure out how to change that.

Git also has a built-in wdiff-like mode. See git-diff(1) for
--word-diff, --word-diff-regex and --color-words.
--word-diff=porcelain might be especially useful for editor
integration.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]