On Wed, 1 Oct 2014, Jed Brown wrote: > Barry Smith <[email protected]> writes: > > Humm, you seem to use sourceDatabase all over the place, I need to put > > it back > > > > Satish I need you help. How do I roll back my last two commits? > > > > commit 35c428b1b3dc6b69b2fab79779ef81d3231bc7a0 > > Author: Barry Smith <[email protected]> > > Date: Wed Oct 1 11:32:32 2014 -0500 > > > > removed dead CHUD code > > > > commit 2cb0f3eae6eb618a9defff89b420aead8b127264 > > Author: Barry Smith <[email protected]> > > Date: Wed Oct 1 09:56:26 2014 -0500 > > > > removed more dead BuildSystem code > > > > I want to get back here on the branch! > > Do you just want to abandon these commits? If so, checkout the branch > and "git reset --hard 2cb0f3eae6eb^". Otherwise you can use "git rebase > -i 2cb0f3eae6eb^" to amend those commits (possibly adding new ones). >
One of them is in next $ git branch -r --contains 2cb0f3eae6eb618a9defff89b420aead8b127264 origin/barry/remove-sidl origin/next So perhaps remove 35c428b1b3dc6b69b2fab79779ef81d3231bc7a0 - but 'git revert 2cb0f3eae6eb618a9defff89b420aead8b127264' the second one Satish
