[FFmpeg-devel] Confusing git merges

Tomas Härdin tomas.hardin at codemill.se
Mon Mar 21 09:02:02 CET 2011

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?


More information about the ffmpeg-devel mailing list