[Kde-pim] [Kde-scm-interest] Git and the needs of KDE PIM

[Riccardo Iaconelli]

On Sunday 17 January 2010 00:03:43 Oswald Buddenhagen wrote:
>  but git doesn't have an svnmerge tool to keep track of
> cherry-picked and even more blacklisted commits ...

I'm not 100% sure, but i noticed that if you try to merge a branch with 
cherry-picked commits git will notice and will work well with them, without 
causing conflicts.

But, if you mean getting back a human-readable list of cherry-picked commits, 
yeah, there's no way to get it out of git.

Bye,
-Riccardo
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/