From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Gurjeet Singh <gurjeet@singh.im>, git@vger.kernel.org
Subject: Re: Git diff misattributes the first word of a line to the previous line
Date: Thu, 13 Oct 2022 19:16:05 +0700 [thread overview]
Message-ID: <1ebea198-fa2a-3f79-e698-64fa4799bcde@gmail.com> (raw)
In-Reply-To: <CABwTF4U-KXHF7=8RWY7Ecbspz205Msa3syZFiWYDg3XmZsNGVw@mail.gmail.com>
On 10/13/22 12:51, Gurjeet Singh wrote:
> # **** Expected **** output
> $ git diff --word-diff=plain /tmp/1.txt /tmp/2.txt
> diff --git a/tmp/1.txt b/tmp/2.txt
> index 8239f93..099fb80 100644
> --- a/tmp/1.txt
> +++ b/tmp/2.txt
> @@ -1,2 +1,2 @@
> x = yz {+opt1+}
> [-ab-]{+ac+} = [-cd ef-]{+pq opt2+}
>
What Git version (and on what system) you made the expected diff above?
--
An old man doll... just what I always wanted! - Clara
prev parent reply other threads:[~2022-10-13 12:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-13 5:51 Git diff misattributes the first word of a line to the previous line Gurjeet Singh
2022-10-13 6:45 ` Johannes Sixt
2022-10-13 11:30 ` Philip Oakley
2022-10-13 12:16 ` Bagas Sanjaya [this message]
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=1ebea198-fa2a-3f79-e698-64fa4799bcde@gmail.com \
--to=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gurjeet@singh.im \
/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).