On Fri, May 25, 2012 at 1:35 PM, Akos Vandra <axo...@gmail.com> wrote: > Hi! > > Question in brief: How do I make a commit depend on two other ones? > > I've update a few patches over the current master head that have not > yet been integrated. From now on I'll need to work with Andreas' mpsse > driver patches which also have not yet been integrated.
Create a new branch from master, apply Andreas' patches, and then your patches to that branch (cherry-pick), and rebase your branch on top of master now and then. Edgar > So basically, what I'd need to do is check out the master branch, then > somehow import my own patches and Andreas' patches, and then commit my > new patches which depend on both of them. How can this be done? > > Regards, > Ákos Vandra > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > OpenOCD-devel mailing list > OpenOCD-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openocd-devel ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ OpenOCD-devel mailing list OpenOCD-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openocd-devel
