From: Jonathan Nieder Date: Fri, 27 Aug 2010 02:13:10 GMT Subject: Re: Treating similar blank lines between hunks as part of the hunks Message-ID: <20100827021310.GA23924@burratino> In-Reply-To: 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"?