projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3c39e9b) | patch
combine-diff: update --cc "uninteresting hunks" logic.
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Feb 2006 08:12:55 +0000 (00:12 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Feb 2006 10:02:20 +0000 (02:02 -0800)
commitbf1c32bdec8223785c779779d0a660a099f69a63
tree2e78720acf55e2a509f65a8f8c2093b874a552aetree | snapshot
parent3c39e9bdebd68d8d45b3900bc21171642f4c6125commit | diff
combine-diff: update --cc "uninteresting hunks" logic.

Earlier logic was discarding hunks that has difference from only
one parent or the same difference from all but one parent.  This
changes it to check if the differences on all lines are from the
same sets of parents.  This discards more uninteresting hunks
and seems to match expectations more naturally.

Signed-off-by: Junio C Hamano <junkio@cox.net>
combine-diff.c diff | blob | history
The core git plumbing