![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 25 Jan 2006 21:11:38 +0000 (13:11 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 28 Jan 2006 08:08:29 +0000 (00:08 -0800) | ||
| commit | 263eee29e94de935d62c7c4066fcea0ccfbe60b8 | |
| tree | 3ef0d06f4f04fa4cafca6ff428eef7165a2d8691 | tree | snapshot |
| parent | e228340961e0f48c6b818251bd4729b2d19647e4 | commit | diff |
combine-diff: extend --cc logic to Octopus.
Santi Bejar points out that a hunk that changes from all the
same common parents except one is uninteresting. The earlier
round marked changes from only one parent uninteresting, but
this also marks hunks that have the same change from all but one
parent uninteresting, which is a natural extension of the
original idea to Octopus merges.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Santi Bejar points out that a hunk that changes from all the
same common parents except one is uninteresting. The earlier
round marked changes from only one parent uninteresting, but
this also marks hunks that have the same change from all but one
parent uninteresting, which is a natural extension of the
original idea to Octopus merges.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| combine-diff.c | diff | blob | history |