summaryrefslogtreecommitdiff
path: root/receive-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-02 01:28:08 -0800
committerJunio C Hamano <junkio@cox.net>2006-02-02 02:02:20 -0800
commitfd4b1d2193640009c9303daa784691fc5e102018 (patch)
treea238aa3d7f3be2b922de350b46667a9bfd6dae5d /receive-pack.c
parentbf1c32bdec8223785c779779d0a660a099f69a63 (diff)
downloadgit-fd4b1d2193640009c9303daa784691fc5e102018.tar.gz
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>
Diffstat (limited to 'receive-pack.c')
0 files changed, 0 insertions, 0 deletions