On Sat, 27 Jul 2013 10:19:09 AM Thomas Lübking wrote: > Not trivially. > Master might have progressed and differs from "my-branch" > You'll then spam your patch with reverting all the stuff that has meanwhile > been changed in master. > > -> First rebase your branch on (origin/)master, then the above will get you > a clean diff of your local changes on top of "some" origin/master commit.
I had discontinunous commits that I wanted separate, so I ended up creating two new clean master branches and cherry picking the commits I wanted. First time I've used cherry pick, much easier than I expected. Very useful. thanks, -- Lindsay
signature.asc
Description: This is a digitally signed message part.
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
