]> git.ipfire.org Git - thirdparty/git.git/commit - combine-diff.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bf1c32b) | patch
combine-diff: add safety check to --cc.
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Feb 2006 09:28:08 +0000 (01:28 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Feb 2006 10:02:20 +0000 (02:02 -0800)
commitfd4b1d2193640009c9303daa784691fc5e102018
treea238aa3d7f3be2b922de350b46667a9bfd6dae5dtree | snapshot
parentbf1c32bdec8223785c779779d0a660a099f69a63commit | diff
combine-diff: add safety check to --cc.

The earlier change implemented "only two version" check but
without checking if the change rewrites from all the parents.
This implements a check to make sure that a change introduced
by the merge from all the parents is caught to be interesting.

Signed-off-by: Junio C Hamano <junkio@cox.net>
combine-diff.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.