From: Jonathan Nieder <jrnieder@gmail.com>
To: Timur Tabi <timur@freescale.com>
Cc: git <git@vger.kernel.org>
Subject: Re: Treating similar blank lines between hunks as part of the hunks
Date: Thu, 26 Aug 2010 21:13:10 -0500 [thread overview]
Message-ID: <20100827021310.GA23924@burratino> (raw)
In-Reply-To: <AANLkTikZFYSSNMENC5SmKSVt49a+WxXdO0mP=V7Mbi-Q@mail.gmail.com>
Timur Tabi wrote:
> git-diff will do this:
>
> A
> -B
> -C
> +F
> +G
>
> -D
> +H
> E
>
> Instead, I would prefer it did this:
>
> A
> -B
> -C
> -
> -D
> +F
> +G
> +
> +H
> E
>
> This second diff is easier to read, especially when the number of
> hunks is large, but the size of each hunk is small. This can happen
> in source code when one function is replaced with a completely
> different function.
Not sure if it would help in your example, but have you tried
"git diff --patience"?
prev parent reply other threads:[~2010-08-27 2:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-26 20:19 Treating similar blank lines between hunks as part of the hunks Timur Tabi
2010-08-27 2:13 ` Jonathan Nieder [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=20100827021310.GA23924@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=timur@freescale.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).