From: Junio C Hamano <gitster@pobox.com>
To: "Jakub Narębski" <jnareb@gmail.com>
Cc: Stefan Beller <sbeller@google.com>, git@vger.kernel.org
Subject: Re: [RFC/PATCH 2/2] WIP xdiff: markup duplicates differently
Date: Sat, 03 Sep 2016 23:48:33 -0700 [thread overview]
Message-ID: <xmqqlgz8qhxa.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <eb88af2c-d7b1-295e-5f23-a85045bde753@gmail.com> ("Jakub Narębski"'s message of "Sat, 3 Sep 2016 14:25:08 +0200")
Jakub Narębski <jnareb@gmail.com> writes:
> Side note: I wonder if the cousin of unified diff, namely context diff[1],
> is something that we can and should support.
Yes, the lack of support for the copied context (instead of the
unified context) diff format has bugged me over the years. Reading
copied context diff format however is rapidly becoming a lost art,
unfortunately, partly due to our popularity, and the need for the
format has become a lessor issue.
I wonder if a pair of a pre-processor (on the input side, before
running 'git apply') and a post-processor (on the output side,
munging the output from 'git show/diff') would be sufficient.
In any case, I agree with you that it has nothing to do with what
Stefan is doing here.
next prev parent reply other threads:[~2016-09-04 6:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-03 3:31 [RFC/PATCH 0/2] Color moved code differently Stefan Beller
2016-09-03 3:31 ` [PATCH 1/2] diff.c: emit duplicate lines with a different color Stefan Beller
2016-09-03 3:31 ` [RFC/PATCH 2/2] WIP xdiff: markup duplicates differently Stefan Beller
2016-09-03 12:25 ` Jakub Narębski
2016-09-04 5:31 ` Stefan Beller
2016-09-04 10:35 ` Jakub Narębski
2016-09-04 6:48 ` Junio C Hamano [this message]
2016-09-03 7:00 ` [RFC/PATCH 0/2] Color moved code differently Junio C Hamano
2016-09-04 5:23 ` Stefan Beller
2016-09-04 6:41 ` Junio C Hamano
2016-09-04 8:28 ` Stefan Beller
2016-09-04 22:19 ` Junio C Hamano
2016-09-04 9:57 ` Jacob Keller
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlgz8qhxa.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=sbeller@google.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://80x24.org/mirrors/git.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).