Treating similar blank lines between hunks as part of the hunks

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Is there any way to convince git-diff to treat blank lines between two
hunks as part of the hunks for diffing?  That is, if I have these two
files:

-----
A
B
C

D
E
-----

and

-----
A
F
G

H
E
-----

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.  Git sees the blanks in each function as being
common, but everything else is completely different, so the diff is
unreabable.

-- 
Timur Tabi
Linux kernel developer at Freescale
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]