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

[Cornelius]

Am 17.01.2010 12:07, schrieb 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.
git cherry?
But okay, it just works when the patches you cherry-picked were not 
modified...
Cornelius
>
> Bye,
> -Riccardo
> _______________________________________________
> Kde-scm-interest mailing list
> Kde-scm-interest at kde.org
> https://mail.kde.org/mailman/listinfo/kde-scm-interest
>