I wouldn't worry about it. It seems likely that other things from
master did leak into v1.0.x, but at this point I don't think it matters.
v1.0.x and master both build and run (or did last time I checked).
The division between the two is somewhat arbitrary anyway. Tracking
down and reversing the leakage, if there is any other than the _png.cpp
change (which certainly does no harm in v1.0.x), would not be
This probably was already clear to everybody, but you can find
out what came in the merges:
If no force-pushes have been made, and only one merge was mistaken,
then there is a single merge commit that brings *all* of
the mistakenly merged commits into the commit graph.
1) Locate the merge that pulled lots of stuff, e.g., with
git merge-pull-history -l upstream/v1.0.x|less
14406a68c appears to be the first one combining stuff both from
master and v1.0.x.
668ef6d8 is a red herring as it shows a merge from already
2) git show 14406a68c
Merge: fdf5fae 132f967
What was pulled in from master to v1.0.x:
git log --oneline fdf5fae ^132f967
git diff 132f967 fdf5fae
On Fri, 27 May 2011 07:29:15 -1000, Eric Firing wrote: