projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f16706c) | patch
combine-diff: cleanup.
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Feb 2006 23:17:42 +0000 (15:17 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 3 Feb 2006 01:53:26 +0000 (17:53 -0800)
commit46dc941246af6e845eb7835afdb8cd20eed835b7
tree2b022b9b34b375afff456e7527a3d89a56ce8abftree | snapshot
parentf16706cc59af32d0255e0a5ec9d04475bc976edecommit | diff
combine-diff: cleanup.

The flag on the surviving lines meant "this parent is not
different" while the parent_map flag on the lost lines meant
"this parent is different", which was confusing.  So swap the
meaning of on-bit in the flag.  Also more heavily comment the
code.

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