From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Ott Subject: Re: Re: Git recommendations Date: Mon, 01 Dec 2008 15:25:57 +0100 Message-ID: <87r64sotu2.fsf@gmail.com> References: <492b1878.0baa660a.1558.ffff81e4@mx.google.com> <20524da70811301829h76b19f67k801802105a36d00f@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L79iy-0006H3-Bt for emacs-orgmode@gnu.org; Mon, 01 Dec 2008 09:26:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L79iw-0006FP-4R for emacs-orgmode@gnu.org; Mon, 01 Dec 2008 09:26:07 -0500 Received: from [199.232.76.173] (port=58584 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L79iv-0006FE-Tz for emacs-orgmode@gnu.org; Mon, 01 Dec 2008 09:26:05 -0500 Received: from ug-out-1314.google.com ([66.249.92.174]:30861) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L79iv-0001oV-Gc for emacs-orgmode@gnu.org; Mon, 01 Dec 2008 09:26:05 -0500 Received: by ug-out-1314.google.com with SMTP id 36so2974659uga.17 for ; Mon, 01 Dec 2008 06:26:03 -0800 (PST) In-Reply-To: <20524da70811301829h76b19f67k801802105a36d00f@mail.gmail.com> (Samuel Wales's message of "Sun, 30 Nov 2008 19:29:47 -0700") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Samuel Wales Cc: emacs-orgmode@gnu.org, Richard Riley , Linh Dang Re >>>>> "SW" == Samuel Wales writes: SW> Do you know whether any of the git modes allow you to preprocess the SW> files that get diffed or ediffed? in magit you can see diff for separate files SW> For example, let's say that you want to ignore all line moves. In SW> that case, you might run both files (e.g. an old version and the SW> current version) through "sort -u". SW> Then the diff will look funny if you made a lot of changes, but if you SW> only moved lines, it would show up as a zero diff, which is exactly SW> what you want if you don't care about line moves. If you made just a SW> few changes and a lot of line moves, those changes would show up. A SW> more sophisticated algorithm could keep the changed lines in place. SW> Likewise, you could preprocess org files to make diffs cleaner by SW> eliminating all level changes, etc. SW> I have done this in the shell for a long time and found it useful; it SW> would be nice in a git mode, if any support that. SW> Of course, perhaps it could be done in ediff, somehow. SW> I wonder if dvc will win because it has backends. You can look through modes, described in my article at http://xtalk.msk.su/~ott/en/writings/emacs-vcs/EmacsGit.html In DVC, as i remember, support for Git is still very basic -- With best wishes, Alex Ott, MBA http://alexott.blogspot.com/ http://xtalk.msk.su/~ott/ http://alexott-ru.blogspot.com/