[FFmpeg-devel] Confusing git merges

Michael Niedermayer michaelni at gmx.at
Mon Mar 21 11:37:41 CET 2011

On Mon, Mar 21, 2011 at 10:53:56AM +0100, Tomas Härdin wrote:
> Michael Niedermayer skrev 2011-03-21 10:42:
>> On Mon, Mar 21, 2011 at 09:02:02AM +0100, Tomas Härdin wrote:
>>> Michael Niedermayer skrev 2011-03-19 20:32:
>>>> Hi
>>>> I know alot of people have been confused seeing changes and then seeing them
>>>> reverted, or seeing changes on the ML that arent in the merged version
>>>> I really hate it as well, but this is how 'git pull' works
>>>> Unless we modify git or at least the mailing list hook these things will
>>>> keep showing up.
>>>> when theres a merge, the hook posts all changes of the merged branch no matter
>>>> if they are in the actual result or not.
>>>> i cant really do anything about it, except hacking the ML hook to filter it
>>>> out
>>> Why not squash the reverts into the merge before pushing?
>> i agree that this is better, especially in the sense of not poluting
>> history. Ive done it also at least twice, and will probably keep using it
>> but it doesnt stop the "unmerged" commits from showing up
> You could always cherry-pick

I know, i guess it depends on how bad the tree is, currently the commit quality
is definitly on a downward trend there

Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

When you are offended at any man's fault, turn to yourself and study your
own failings. Then you will forget your anger. -- Epictetus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20110321/64a6b848/attachment-0001.asc>

More information about the ffmpeg-devel mailing list