[FFmpeg-devel] Confusing git merges

Michael Niedermayer michaelni at gmx.at
Sat Mar 19 20:32:06 CET 2011


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

Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

When the tyrant has disposed of foreign enemies by conquest or treaty, and
there is nothing more to fear from them, then he is always stirring up
some war or other, in order that the people may require a leader. -- Plato
-------------- 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/20110319/00d0fcda/attachment-0001.asc>

More information about the ffmpeg-devel mailing list