emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Alex Ott <alexott@gmail.com>
To: Samuel Wales <samologist@gmail.com>
Cc: emacs-orgmode@gnu.org, Richard Riley <rileyrgdev@googlemail.com>,
	Linh Dang <linhd@nortel.com>
Subject: Re: Re: Git recommendations
Date: Mon, 01 Dec 2008 15:25:57 +0100	[thread overview]
Message-ID: <87r64sotu2.fsf@gmail.com> (raw)
In-Reply-To: <20524da70811301829h76b19f67k801802105a36d00f@mail.gmail.com> (Samuel Wales's message of "Sun, 30 Nov 2008 19:29:47 -0700")

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/

  reply	other threads:[~2008-12-01 14:26 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-27 14:44 Git recommendations Richard Riley
2008-10-27 17:53 ` Ross Patterson
2008-10-27 18:22   ` Richard Riley
2008-10-27 18:31     ` Ross Patterson
2008-10-27 18:47       ` Richard Riley
2008-10-27 20:51       ` Mykola Nikishov
2008-10-28 18:40         ` Ross Patterson
2008-11-24 19:44 ` Linh Dang
2008-11-24 21:10   ` Richard Riley
2008-12-01  2:29     ` Samuel Wales
2008-12-01 14:25       ` Alex Ott [this message]
2008-12-01 15:56         ` Richard Riley
2008-12-07 22:15         ` Samuel Wales
2008-12-08 12:36           ` Tim O'Callaghan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87r64sotu2.fsf@gmail.com \
    --to=alexott@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=linhd@nortel.com \
    --cc=rileyrgdev@googlemail.com \
    --cc=samologist@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).