[Kde-scm-interest] Git and the needs of KDE PIM
Riccardo Iaconelli
riccardo at kde.org
Sun Jan 17 12:07:13 CET 2010
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
More information about the Kde-scm-interest
mailing list