From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.help Subject: Re: Tweaking magit/diff mode to be more helpful in text editing Date: Wed, 1 Jun 2016 10:17:11 +0600 Message-ID: References: <87shwyvi0w.fsf@ericabrahamsen.net> <20160531075538.GA25176@tuxteam.de> <87h9ddsglu.fsf@ericabrahamsen.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1464754697 26647 80.91.229.3 (1 Jun 2016 04:18:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Jun 2016 04:18:17 +0000 (UTC) Cc: "help-gnu-emacs@gnu.org" To: Eric Abrahamsen Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Wed Jun 01 06:18:15 2016 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1b7xbh-0000hG-QI for geh-help-gnu-emacs@m.gmane.org; Wed, 01 Jun 2016 06:18:13 +0200 Original-Received: from localhost ([::1]:39515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7xbh-00012r-24 for geh-help-gnu-emacs@m.gmane.org; Wed, 01 Jun 2016 00:18:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7xb2-00010d-Vs for help-gnu-emacs@gnu.org; Wed, 01 Jun 2016 00:17:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7xb1-0005SH-Vi for help-gnu-emacs@gnu.org; Wed, 01 Jun 2016 00:17:32 -0400 Original-Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:36589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7xb1-0005SB-Nv for help-gnu-emacs@gnu.org; Wed, 01 Jun 2016 00:17:31 -0400 Original-Received: by mail-lf0-x241.google.com with SMTP id h68so644640lfh.3 for ; Tue, 31 May 2016 21:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=FwnqHLq22mXZrRizCjMmvzn6q4+Yts91WvcOb7eh7Uc=; b=LhNEDxw8/o0D9JkDOG5U5h0tSZ8Cidl186Uk8Ia9ELwgbDxUGepbpJVQU/HgY4UoCk RnwgZIG87jDmme8VXBNY3zVrWFE93VQjEe6nIhF2+OfBKC2cbAV0wOHPz0qUewExlIIT qvA96qZDf85cOJH38LyFxeDA52nHtKr7iBJjZJDTuJbhWxXZfJGElMB1KOpxLAFZncVx LzUcpkRIfBKWJl1FPB7FtxGAJnfSPaB5hz12Nm63EKUFaIfvHlTaWtFiVFPDMjRdYFWP zWWyuKL6G+4O63Jg95hRW/k+mFmFNkWj4mgoc/HnRrj8X1IFenhQB1kbdGaKOXQDs/4r +YCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=FwnqHLq22mXZrRizCjMmvzn6q4+Yts91WvcOb7eh7Uc=; b=j5mbBQ5hfAB0gvFrVD+aYaLB+phIgiUwHqWOEOHVBSo6Os3HMC4FBIOada7iKvYjW8 0CN5CdbReXs+tH2uPv1tngNHa1x1LcA5xITiEjZsr4cM/vYdfJlL1vQEXm+jSwS4oCGA DxbX1/NqkHQe7qoF20R2Kr4kIsiCxNdB0FOuKG4981c9dlt/VXOCrNW1LgtIV6Lcl1al Mgy1mMaFQK3qpqE82Mz2PDzrCy79ZPIbwQ/DDZ/qBCfhLCQEHkwbgAOVT2B2v9kQQrVR 2FiQ2Oqz6KkphkBU6+XzuChfoJt+yBnGcVzA4BGlGdhHTuT5nAfw5o438YXBElheBlyD SKPA== X-Gm-Message-State: ALyK8tLDgQ2DyEQm5ki6JB2w07CuZguEJ1phr+yBGC6WPdYdVt+NqCT+3X031TgU0ZUWTwrs2oL/2XTD3/asvg== X-Received: by 10.25.153.85 with SMTP id b82mr616733lfe.211.1464754650987; Tue, 31 May 2016 21:17:30 -0700 (PDT) Original-Received: by 10.114.182.167 with HTTP; Tue, 31 May 2016 21:17:11 -0700 (PDT) In-Reply-To: <87h9ddsglu.fsf@ericabrahamsen.net> X-Google-Sender-Auth: Z3-5EP352wfW_Dmlr-lUrvbQjlA X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::241 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "help-gnu-emacs" Xref: news.gmane.org gmane.emacs.help:110158 Archived-At: On Wed, Jun 1, 2016 at 10:00 AM, Eric Abrahamsen wrote: > 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.