Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Received-SPF: error (athena.apache.org: local policy)
Date: Tue, 28 May 2013 14:02:02 -0400
From: Chip Childers <chip.childers@sungard.com>
To: dev@cloudstack.apache.org
Subject: Re: Question about Review Request
Message-ID: <20130528180202.GX11891@USLT-205755.sungardas.corp>
References: 
 <CACOnxCg-z83G4WOba2CQDDYRCSNMoOhSSDfi0urcG7ZyJ1WVWQ@mail.gmail.com>
 <DB6FA658-51BE-41AD-8A4A-1D545766D03D@gmail.com>
 <CACOnxCh2-y_dy6Wz1Ov2b03hBNJjHfoUqNN=+nyBnzPa22ipvw@mail.gmail.com>
 <CACOnxCinMHqXDV3DWGZAxpF-VjDn4RcjqRaaRE+4w4Mbu5fORA@mail.gmail.com>
 <9061577063239463257@unknownmsgid>
 <CACOnxChmig_DiANMrO1TYRKqUHas8QnhD2gP_+vrYgddaKUFzA@mail.gmail.com>
 <-8057021959541776336@unknownmsgid>
 <CACOnxCgnYCxQATFQH7Xw2SdU-7t2_yfXrTcwzokfUCq9Ee4rGw@mail.gmail.com>
 <20130528175144.GW11891@USLT-205755.sungardas.corp>
 <CACOnxCh+F2k2eFB=siCDqMJNivRixfPZi7=zg3HKr5gQsaJ3vg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: 
 <CACOnxCh+F2k2eFB=siCDqMJNivRixfPZi7=zg3HKr5gQsaJ3vg@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)

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.