emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Eric Schulte <eric.schulte@gmx.com>
To: Jambunathan K <kjambunathan@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: Participating in Google Summer of Code 2012
Date: Fri, 02 Mar 2012 09:56:14 -0700	[thread overview]
Message-ID: <87y5rjlz69.fsf@gmx.com> (raw)
In-Reply-To: <81wr73x803.fsf@gmail.com> (Jambunathan K.'s message of "Fri, 02 Mar 2012 22:20:04 +0530")

Jambunathan K <kjambunathan@gmail.com> writes:

> "Git merge tool for Org files"
>
> http://lists.gnu.org/archive/html/emacs-orgmode/2011-08/msg00601.html
>

Interesting, along these lines, I know git is able to use custom diffs
(e.g., there exist sentence rather than line-based diffs for writing
prose).  I wonder if an outline diff would be useful, so that
re-ordering subtrees in an Org-mode file was represented as a single
operation rather than many un-related deletions and insertions.

-- 
Eric Schulte
http://cs.unm.edu/~eschulte/

  reply	other threads:[~2012-03-02 16:56 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-02  8:24 Participating in Google Summer of Code 2012 Bastien
2012-03-02 16:42 ` Eric Schulte
2012-03-04  1:05   ` Rasmus
2012-03-04  9:28     ` Nicolas Goaziou
2012-03-04 10:02       ` Jambunathan K
2012-03-09 17:17         ` Nicolas Goaziou
2012-03-05 19:10   ` Thorsten
2012-03-02 16:50 ` Jambunathan K
2012-03-02 16:56   ` Eric Schulte [this message]
2012-03-02 17:12     ` Jambunathan K
2012-03-04 15:14       ` Alan Schmitt
2012-03-07 18:18         ` Bastien
2012-03-09  1:43           ` Bastien

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=87y5rjlz69.fsf@gmx.com \
    --to=eric.schulte@gmx.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=kjambunathan@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).