Johannes Sixt schrieb: > While investigating a path-filtered history in gitk, I noticed a layout > like this: > > --A---------M--4--N > \ / / > 1--2--3-----5 > > There are no commits displayed on the upper line between A and M. > Shouldn't this have been simplified to: > > 4--N > / / > --A--1--2--3--5 Ok, it turns out that M is an evil merge, i.e. the file in M is different from both A and 3, but in such a way that it does not show up in a diff --cc that has only 3 lines of context. In particular, one of the commits 1, 2, 3 added a single line at an isolated spot in the file, and I undid that addition in the merge commit M. Sorry for the noise. -- Hannes (So, *that's* why they are called "evil"!) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
