From: saurabh gupta <saurabhgupta1403@gmail.com>
To: david@lang.hm
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org
Subject: Re: Google Summer of Code 2009: GIT
Date: Fri, 13 Mar 2009 08:45:04 +0530 [thread overview]
Message-ID: <ab9fa62a0903122015l58c32ca5mfbe1e04e9a2353aa@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.10.0903121343590.16753@asgard.lang.hm>
On Fri, Mar 13, 2009 at 2:15 AM, <david@lang.hm> wrote:
>
> when I am mentioning config files here I'm thinking of ones that don't use
> XML (such as the git config file)
>
> a 'paragraph' merge driver could also help with things like a maintainers
> file where the order of the paragaphs doesn't matter, just the content
> inside each one.
>
> that's very similar to re-ordering XML tags, but with a slightly different
> syntax
yes, in that case, I think we can modify the existing text merge
driver somewhat and provide these configuration options to the user.
User can choose the option to configure the merge operation.
--
Saurabh Gupta
Senior,
NSIT,New Delhi, India
next prev parent reply other threads:[~2009-03-13 3:16 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-11 4:52 Google Summer of Code 2009: GIT Saurabh Gupta
2009-03-11 5:56 ` Daniel Barkalow
[not found] ` <ab9fa62a0903102317l3a7322f7w5e4d9ba0e02af37b@mail.gmail.com>
2009-03-11 9:04 ` saurabh gupta
2009-03-11 8:59 ` David Symonds
2009-03-11 9:02 ` saurabh gupta
2009-03-11 11:55 ` Johannes Schindelin
2009-03-11 11:55 ` David Symonds
2009-03-11 12:52 ` Johannes Schindelin
2009-03-11 11:58 ` Johannes Schindelin
2009-03-11 12:11 ` saurabh gupta
2009-03-11 12:58 ` Johannes Schindelin
2009-03-11 13:55 ` saurabh gupta
2009-03-11 14:02 ` Johannes Schindelin
2009-03-11 14:13 ` saurabh gupta
2009-03-11 15:27 ` Rogan Dawes
2009-03-11 16:21 ` saurabh gupta
2009-03-11 15:38 ` Johannes Schindelin
2009-03-11 16:29 ` saurabh gupta
2009-03-11 16:29 ` Daniel Barkalow
2009-03-11 16:44 ` Johannes Schindelin
2009-03-12 12:56 ` Michael J Gruber
2009-03-12 13:07 ` Johannes Schindelin
2009-03-12 13:15 ` Michael J Gruber
2009-03-12 18:25 ` david
2009-03-11 16:58 ` saurabh gupta
2009-03-12 12:47 ` Michael J Gruber
2009-03-11 16:32 ` david
2009-03-11 17:01 ` Johannes Schindelin
2009-03-11 19:30 ` david
2009-03-11 19:55 ` Johannes Schindelin
2009-03-11 17:07 ` saurabh gupta
2009-03-11 19:29 ` david
2009-03-11 20:02 ` saurabh gupta
2009-03-11 20:21 ` david
2009-03-11 20:37 ` Johannes Schindelin
2009-03-11 21:05 ` david
2009-03-11 21:47 ` Junio C Hamano
2009-03-12 1:57 ` thestar
2009-03-12 7:40 ` Junio C Hamano
2009-03-12 12:45 ` saurabh gupta
2009-03-12 18:00 ` david
2009-03-12 18:43 ` Junio C Hamano
[not found] ` <ab9fa62a0903121119j6c2a1d43kd9cda99db47b5e7c@mail.gmail.com>
2009-03-12 18:53 ` david
2009-03-12 19:00 ` saurabh gupta
2009-03-12 19:29 ` david
2009-03-12 19:45 ` saurabh gupta
2009-03-12 19:59 ` david
2009-03-12 20:03 ` saurabh gupta
2009-03-12 20:45 ` david
2009-03-13 3:15 ` saurabh gupta [this message]
2009-03-18 23:16 ` Johannes Schindelin
2009-03-18 23:55 ` david
2009-03-19 0:43 ` Johannes Schindelin
2009-03-19 8:37 ` david
2009-03-19 10:24 ` Johannes Schindelin
2009-03-19 19:12 ` david
2009-03-19 19:23 ` saurabh gupta
2009-03-19 6:30 ` Caleb Cushing
2009-03-19 10:19 ` Johannes Schindelin
2009-03-21 23:53 ` Caleb Cushing
2009-03-19 19:17 ` saurabh gupta
2009-03-19 23:42 ` Johannes Schindelin
2009-03-20 0:07 ` david
2009-03-20 0:30 ` Johannes Schindelin
2009-03-20 3:09 ` david
2009-03-20 9:35 ` Johannes Schindelin
2009-03-20 20:50 ` david
2009-03-21 17:38 ` saurabh gupta
[not found] ` <ab9fa62a0903211031l78c7afadg9409a544f2bda7db@mail.gmail.com>
2009-03-21 17:36 ` saurabh gupta
2009-03-12 20:18 ` Junio C Hamano
2009-03-12 12:42 ` saurabh gupta
2009-03-12 18:03 ` david
2009-03-12 18:23 ` saurabh gupta
2009-03-13 9:41 ` Rogan Dawes
2009-03-13 20:18 ` saurabh gupta
2009-03-11 19:36 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ab9fa62a0903122015l58c32ca5mfbe1e04e9a2353aa@mail.gmail.com \
--to=saurabhgupta1403@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=david@lang.hm \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).