Thanks a lot, Chip! That did the trick. I've definitely been picking up quite a bit about Git these past few days. :)
On Tue, May 28, 2013 at 3:58 PM, Chip Childers <chip.child...@sungard.com>wrote: > In master: git fetch origin; git reset --hard origin/master > > Then git am filename > > Then do the rebase > > On May 28, 2013, at 5:54 PM, Mike Tutkowski > <mike.tutkow...@solidfire.com> wrote: > > > So, I've merged master to my solidfire_plugin branch a couple times now > (on > > different days over the past week or so). If I do a git rebase -i HEAD~2, > > it goes back to my most recent merge, then wants to squash all of the > > commits I picked up from master for my next merge. > > > > Not sure what to do here. > > > > > > On Tue, May 28, 2013 at 3:01 PM, Mike Tutkowski < > > mike.tutkow...@solidfire.com> wrote: > > > >> Thanks, Chip! > >> > >> I was busy talking to a customer about CloudStack for a while, but > should > >> be able to re-submit my patch soon. > >> > >> > >> On Tue, May 28, 2013 at 12:02 PM, Chip Childers < > chip.child...@sungard.com > >>> wrote: > >> > >>> On Tue, May 28, 2013 at 11:57:32AM -0600, Mike Tutkowski wrote: > >>>> Thanks, Chip! > >>>> > >>>> I didn't know that would be a problem. > >>>> > >>>> If you know off hand, can you tell me how to do a squash? > >>>> > >>>> Thanks again! > >>> > >>> In your branch, do: > >>> > >>> git rebase -i HEAD~2 > >>> > >>> You're editor will pull up something like the following: > >>> > >>> pick 08c0f85 SolidFire plug-in and enhancements to the storage plug-in > >>> framework > >>> pick 64a96fd Replaced hard-coded values with references to variable > data > >>> > >>> Change the second "pick" to "squash" if you want to combine commit > >>> messages. Change it to "fixup" if you just want to drop the second > >>> commit's message. > >>> > >>> Then do the format patch thing again and try to re-submit. > >> > >> > >> > >> -- > >> *Mike Tutkowski* > >> *Senior CloudStack Developer, SolidFire Inc.* > >> e: mike.tutkow...@solidfire.com > >> o: 303.746.7302 > >> Advancing the way the world uses the cloud< > http://solidfire.com/solution/overview/?video=play> > >> *™* > > > > > > > > -- > > *Mike Tutkowski* > > *Senior CloudStack Developer, SolidFire Inc.* > > e: mike.tutkow...@solidfire.com > > o: 303.746.7302 > > Advancing the way the world uses the > > cloud<http://solidfire.com/solution/overview/?video=play> > > *™* > -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7302 Advancing the way the world uses the cloud<http://solidfire.com/solution/overview/?video=play> *™*
