On Sat, Nov 30, 2013 at 9:25 PM, Mark Gaiser <markg85@gmail.com> wrote:
Hi,

I don't even know if cherry picking is the right approach so it might
be better if i explain what i want to do. You, git gurus, surely can
share how i need to get there, right? :)

In recent months Dawit (in cc) has added quite some nice optimizations
to the SMB kioslave. He' done with those changes now so i'd like to
pull those into the frameworks branch and update my porting patch to
get that slave working on Qt5/KF5.

The question is: What is the best way to get those changes from master
to frameworks? You can easily see the changes by checking out the
master branch (kde-runtime) and typing:
git log --stat b21dc0a.. kioslave/smb/

@Dawit, are those all the changes you made? Or did you also do
something related but outside the smb folder?

Yes, 6c0de32 being the one about the optimization.