From mboxrd@z Thu Jan 1 00:00:00 1970 From: Herbert Sitz Subject: Re: Org, Diffs, and Version Control Date: Sun, 16 Oct 2011 16:56:28 +0000 (UTC) Message-ID: References: <87pqhxng5f.fsf@norang.ca> <87hb395570.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([140.186.70.92]:48853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFU0y-0003r6-J6 for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 12:56:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFU0x-0005RE-9s for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 12:56:44 -0400 Received: from lo.gmane.org ([80.91.229.12]:41476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFU0x-0005R8-4V for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 12:56:43 -0400 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1RFU0v-0006Zt-Ab for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 18:56:41 +0200 Received: from c-24-22-131-140.hsd1.wa.comcast.net ([24.22.131.140]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Oct 2011 18:56:41 +0200 Received: from hesitz by c-24-22-131-140.hsd1.wa.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Oct 2011 18:56:41 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Eric Schulte gmail.com> writes: > Additionally you could try the --word-diff option to git, i.e., > > git diff --word-diff > > or > > git diff --word-diff=color > > which returns diffs which ignore whitespace changes and which show > changes on the word rather than line level. I believe it is possible to > make this behavior default for a git repository but I've never done so > and don't know how such a default would be specified. > > Hope this helps -- Eric > Thanks for the tip. Here's some info that I think shows how to make --word-diff option the default for a particular type (e.g., .org) fie: http://stackoverflow.com/questions/7542543/use-gits-word-diff-for-latex-files -- Herb