Moving commits from one branch to another (improving my git fu!)

2013-10-21 Thread Mandeep Sandhu
Hi All, I'm in a bit of a pickle! :) So I've come to ask for help from the guru's here. My story is not unique but somehow the various suggested solutions don't seem to work in my case. * I was working on a feature which was supposed to be done off our 'dev' branch. But instead I forgot and bran

Re: Moving commits from one branch to another (improving my git fu!)

2013-10-21 Thread Mandeep Sandhu
>> $ git rebase dev stable topicA >> (this was suggested in the manpage as well). > > > I guess you also had an "--onto" in there, as the above would throw a syntax > error. As long as the branches are in order, I cannot see how that wouldn't > do what you wanted. Yes, you're right. There was "--o

Re: Moving commits from one branch to another (improving my git fu!)

2013-10-21 Thread Mandeep Sandhu
ing it to pick those 2 and apply them on the dev branch. But instead it's applying a LOT of commits on dev. Remember that 'dev' is very different from 'stable'. As suggested, maybe cherry-pciking is what I need to do. Thanks, -mandeep > > > Hope this helps,

Re: Moving commits from one branch to another (improving my git fu!)

2013-10-22 Thread Mandeep Sandhu
am-to option to point to 'dev' on a branch that was branched off from 'stable'! :) Lesson learned. I'll be careful when doing branching next time :) -mandeep On Tue, Oct 22, 2013 at 6:12 PM, Noufal Ibrahim wrote: > Mandeep Sandhu writes: > >> Hi All, >>