From: Karthik Nayak <karthik.188@gmail.com>
To: oliver@schinagl.nl
Cc: git@vger.kernel.org, Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH 0/2] Support diff.wordDiff config
Date: Sat, 2 Mar 2024 10:57:49 +0100 [thread overview]
Message-ID: <20240302095751.123138-1-karthik.188@gmail.com> (raw)
In-Reply-To: <a7be415d-5005-4fa7-9b2e-1974b7439a81@schinagl.nl>
This patch series adds the diff.wordDiff config option. This mimics the
'--word-diff' option of `git-diff(1)`.
The first patch is more of a preparatory patch, which makes it easier to
add tests when the actual config is added in patch 2.
Karthik Nayak (2):
t4034: extract out `diff_with_opts`
diff: add 'diff.wordDiff' config option
Documentation/config/diff.txt | 4 +++
diff.c | 50 +++++++++++++++++++++------
t/t4034-diff-words.sh | 63 ++++++++++++++++++++---------------
3 files changed, 80 insertions(+), 37 deletions(-)
--
2.43.GIT
next prev parent reply other threads:[~2024-03-02 9:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-28 8:54 Allow setting diff.worddiff=color via gitconfig Olliver Schinagl
2024-03-02 9:57 ` Karthik Nayak [this message]
2024-03-02 9:57 ` [PATCH 1/2] t4034: extract out `diff_with_opts` Karthik Nayak
2024-03-02 9:57 ` [PATCH 2/2] diff: add 'diff.wordDiff' config option Karthik Nayak
2024-03-02 10:25 ` Eric Sunshine
2024-03-02 18:02 ` Karthik Nayak
2024-03-02 19:57 ` Jean-Noël AVILA
2024-03-02 17:03 ` [PATCH 0/2] Support diff.wordDiff config Junio C Hamano
2024-03-02 18:02 ` Karthik Nayak
2024-03-02 19:57 ` Kristoffer Haugsbakk
2024-03-03 7:23 ` Chris Torek
2024-03-03 17:45 ` Junio C Hamano
2024-03-22 22:08 ` Olliver Schinagl
2024-03-25 21:53 ` Dragan Simic
2024-03-22 22:05 ` Olliver Schinagl
2024-03-22 21:59 ` Olliver Schinagl
2024-03-22 21:57 ` Olliver Schinagl
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=20240302095751.123138-1-karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--cc=oliver@schinagl.nl \
/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).